Merge branch '1.3' of 10.1.1.27:/shared/ctdb/ctdb-git into 1.3
authorRonnie Sahlberg <sahlberg@lenovo-laptop.(none)>
Fri, 18 Feb 2011 00:02:21 +0000 (11:02 +1100)
committerRonnie Sahlberg <sahlberg@lenovo-laptop.(none)>
Fri, 18 Feb 2011 00:02:21 +0000 (11:02 +1100)

Trivial merge