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

Trivial merge