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

Trivial merge