Merge 'trunk' into 'replication_dedux'
Jess Robinson [Wed, 11 Jun 2008 16:27:21 +0000 (11:27 -0500)]
r13841@dev (orig r4492):  castaway | 2008-06-11 11:27:21 -0500
Blasted relation docs..


Trivial merge