Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
authorAndrew Bartlett <abartlet@samba.org>
Tue, 31 Mar 2009 23:25:03 +0000 (10:25 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 31 Mar 2009 23:25:03 +0000 (10:25 +1100)

Trivial merge