Merge branch 'master' of ssh://git.samba.org/data/git/samba into extended-dn
authorAndrew Bartlett <abartlet@samba.org>
Tue, 9 Dec 2008 20:36:19 +0000 (07:36 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 9 Dec 2008 20:36:19 +0000 (07:36 +1100)

Trivial merge