Merge remote branch 'ddiss/master_pmda_namespace'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 31 Oct 2011 09:25:16 +0000 (20:25 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 31 Oct 2011 09:25:16 +0000 (20:25 +1100)
(This used to be ctdb commit 6dbbc86f36a1fd07d90ca947a35ad7b1f8554636)


Trivial merge