Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Fri, 17 Oct 2008 04:57:07 +0000 (15:57 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 17 Oct 2008 04:57:07 +0000 (15:57 +1100)

Trivial merge