Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Tue, 16 Dec 2008 05:23:10 +0000 (16:23 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 16 Dec 2008 05:23:10 +0000 (16:23 +1100)

Trivial merge