Merge branch 'master' of ssh://git.samba.org/data/git/abartlet/samba into extended...
authorAndrew Bartlett <abartlet@samba.org>
Tue, 16 Dec 2008 00:19:13 +0000 (11:19 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 16 Dec 2008 00:19:13 +0000 (11:19 +1100)

Trivial merge