Merge remote branch 'martins/ctdb_control_oom'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 03:45:56 +0000 (14:45 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 03:45:56 +0000 (14:45 +1100)

Trivial merge