Merge commit 'abartlet/wspp-schema' into wspp-schema
authorAndrew Tridgell <tridge@samba.org>
Thu, 2 Apr 2009 05:43:23 +0000 (16:43 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 2 Apr 2009 05:43:23 +0000 (16:43 +1100)

Trivial merge