Merge branch 'dbms-in-slave'
authorclinton_admin <clinton_admin@deleuze.hcoop.net>
Wed, 1 Dec 2010 07:13:20 +0000 (02:13 -0500)
committerclinton_admin <clinton_admin@deleuze.hcoop.net>
Wed, 1 Dec 2010 07:13:20 +0000 (02:13 -0500)

Trivial merge