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:11:31 +0000 (11:11 +1100)
committerRonnie Sahlberg <sahlberg@lenovo-laptop.(none)>
Fri, 18 Feb 2011 00:11:31 +0000 (11:11 +1100)
commit771e31fbfafed5986aba01c1392385dc4086eccd
treeaba6dafee96d4b601a15e9f0dece7394246b1080
parentf63223f77b669b3e808dbe6361d13cc2d3d03ee0
parent50edbb219754a530821efcc405f9ca061378e579
Merge branch '1.3' of 10.1.1.27:/shared/ctdb/ctdb-git into 1.3