Merge 'multi_stuff' into 'trunk'
Matt S Trout [Mon, 26 Jan 2009 04:27:59 +0000 (04:27 +0000)]
r27538@agaton (orig r5350):  matthewt | 2009-01-25 22:27:59 +0000
extract test


Trivial merge