Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Thu, 15 Apr 2010 03:45:50 +0000 (13:45 +1000)
committerMartin Schwenke <martin@meltin.net>
Thu, 15 Apr 2010 03:45:50 +0000 (13:45 +1000)

Trivial merge