Merge branch 'master' into wspp-schema
authorAndrew Tridgell <tridge@samba.org>
Tue, 31 Mar 2009 04:53:17 +0000 (15:53 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 31 Mar 2009 04:53:17 +0000 (15:53 +1100)

Trivial merge