Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Thu, 23 Oct 2008 01:56:30 +0000 (12:56 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 23 Oct 2008 01:56:30 +0000 (12:56 +1100)

Trivial merge