Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Sat, 31 Jul 2010 10:34:45 +0000 (20:34 +1000)
committerMartin Schwenke <martin@meltin.net>
Sat, 31 Jul 2010 10:34:45 +0000 (20:34 +1000)

Trivial merge