Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Fri, 13 Feb 2009 05:56:35 +0000 (16:56 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 13 Feb 2009 05:56:35 +0000 (16:56 +1100)

Trivial merge