Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Fri, 31 Oct 2008 02:55:26 +0000 (13:55 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 31 Oct 2008 02:55:26 +0000 (13:55 +1100)

Trivial merge