Merge branch 'master' of ssh://git.samba.org/data/git/samba into extended-dn
authorAndrew Bartlett <abartlet@samba.org>
Fri, 12 Dec 2008 04:24:20 +0000 (15:24 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 12 Dec 2008 04:24:20 +0000 (15:24 +1100)

Trivial merge