Merge branch 'master' of git+ssh://tridge@git.samba.org/data/git/tridge/autocluster
authorAndrew Tridgell <tridge@samba.org>
Tue, 8 Jul 2008 09:48:27 +0000 (19:48 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 8 Jul 2008 09:48:27 +0000 (19:48 +1000)

Trivial merge