Merge 'trunk' into 'subquery'

Merge 'trunk' into 'subquery'

r5550@rkinyon-lt-osx (orig r5549):  matthewt | 2009-02-19 23:31:50 -0500
 r27529@agaton (orig r5341):  ribasushi | 2009-01-24 18:28:29 +0000
 small refactor

r5551@rkinyon-lt-osx (orig r5550):  matthewt | 2009-02-19 23:34:55 -0500
 r27530@agaton (orig r5342):  ribasushi | 2009-01-24 18:39:02 +0000
 merge from branches/multicreate

r5552@rkinyon-lt-osx (orig r5551):  matthewt | 2009-02-19 23:35:02 -0500
 r27531@agaton (orig r5343):  ribasushi | 2009-01-24 18:44:08 +0000
 that's it

r5553@rkinyon-lt-osx (orig r5552):  matthewt | 2009-02-19 23:35:07 -0500
 r27538@agaton (orig r5350):  matthewt | 2009-01-25 22:27:59 +0000
 extract test