Merge 'subquery' into 'trunk'
Rob Kinyon [Fri, 20 Feb 2009 05:29:39 +0000 (00:29 -0500)]

Trivial merge