Merge 'multi_stuff' into 'trunk'
Rob Kinyon [Fri, 20 Feb 2009 09:30:17 +0000 (09:30 +0000)]
r27879@agaton (orig r5540):  robkinyon | 2009-02-20 03:30:17 +0000
fixed a few more test situations


Trivial merge