Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Fri, 11 Jul 2008 09:21:39 +0000 (19:21 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 11 Jul 2008 09:21:39 +0000 (19:21 +1000)
(This used to be ctdb commit f8c5f6ff1cae747aae917c454b49dc5db227e140)


Trivial merge