Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Tue, 14 Apr 2009 00:55:53 +0000 (10:55 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 14 Apr 2009 00:55:53 +0000 (10:55 +1000)

Trivial merge