Merge branch 'master' of git://git.samba.org/tridge/ctdb
authorRonnie Sahlberg <sahlberg@ronnie.(none)>
Mon, 4 Feb 2008 06:45:45 +0000 (17:45 +1100)
committerRonnie Sahlberg <sahlberg@ronnie.(none)>
Mon, 4 Feb 2008 06:45:45 +0000 (17:45 +1100)

Trivial merge