Merge commit 'rusty/master'
authorRonnie Sahlberg <sahlberg@sahlberg-laptop.(none)>
Fri, 30 Jul 2010 06:25:40 +0000 (16:25 +1000)
committerRonnie Sahlberg <sahlberg@sahlberg-laptop.(none)>
Fri, 30 Jul 2010 06:25:40 +0000 (16:25 +1000)
(This used to be ctdb commit b4391c00476cde74101736986dfcd2be6c959edc)


Trivial merge