Merge 'trunk' into 'replication_dedux'
Peter Rabbitson [Wed, 7 May 2008 13:33:50 +0000 (08:33 -0500)]
r8495@dev (orig r4354):  ribasushi | 2008-05-07 08:33:50 -0500
Fix a forgotten CDBICompat component relocation


Trivial merge