Merge branch 'master' of ssh://git.samba.org/data/git/samba into extended-dn
authorAndrew Bartlett <abartlet@samba.org>
Thu, 4 Dec 2008 21:24:37 +0000 (08:24 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 4 Dec 2008 21:24:37 +0000 (08:24 +1100)

Trivial merge