Merge branch 'wspp-schema'
authorAndrew Tridgell <tridge@samba.org>
Thu, 9 Apr 2009 04:40:19 +0000 (14:40 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 9 Apr 2009 04:40:19 +0000 (14:40 +1000)

Trivial merge