Merge branch 'ronnie_merge'
authorMartin Schwenke <martin@meltin.net>
Wed, 8 Jul 2009 04:21:36 +0000 (14:21 +1000)
committerMartin Schwenke <martin@meltin.net>
Wed, 8 Jul 2009 04:21:36 +0000 (14:21 +1000)
commitd6862832edfcfe7a4bf3039626706d501483ea1a
tree6ade2e307cdee54392ef79ffd4b21aad736d2840
parent168ec02adf9d0dd6bf3983878637e8c9f01a2640
parentcfbe41b532806215b52b5a840d00231b504ecece
Merge branch 'ronnie_merge'

(This used to be ctdb commit 2ff6ee042080ba1c2bea76bbef3742997d84c9a8)