Merge 'multi_stuff' into 'trunk'
Peter Rabbitson [Sun, 25 Jan 2009 00:28:29 +0000 (00:28 +0000)]
r27529@agaton (orig r5341):  ribasushi | 2009-01-24 18:28:29 +0000
small refactor


Trivial merge