Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Tue, 14 Oct 2008 00:16:59 +0000 (11:16 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 14 Oct 2008 00:16:59 +0000 (11:16 +1100)

Trivial merge