Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Thu, 26 Aug 2010 01:06:57 +0000 (11:06 +1000)
committerMartin Schwenke <martin@meltin.net>
Thu, 26 Aug 2010 01:06:57 +0000 (11:06 +1000)

Trivial merge