Merge 'complex_join_rels' into 'trunk'
Guillermo Roditi [Thu, 17 Jul 2008 21:21:07 +0000 (17:21 -0400)]

Trivial merge