Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Fri, 5 Feb 2010 03:00:23 +0000 (14:00 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 5 Feb 2010 03:00:23 +0000 (14:00 +1100)

Trivial merge