Merge 'diamond_relationships' into 'trunk'
Peter Rabbitson [Mon, 18 May 2009 21:05:10 +0000 (21:05 +0000)]

Trivial merge