Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
authorAndrew Bartlett <abartlet@samba.org>
Sun, 8 Mar 2009 05:16:11 +0000 (16:16 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 8 Mar 2009 05:16:11 +0000 (16:16 +1100)

Trivial merge