Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Fri, 19 Dec 2008 00:01:25 +0000 (11:01 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 19 Dec 2008 00:01:25 +0000 (11:01 +1100)

Trivial merge