Merge commit 'master/master' into wspp-schema
authorAndrew Tridgell <tridge@samba.org>
Wed, 1 Apr 2009 23:17:32 +0000 (10:17 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 1 Apr 2009 23:17:32 +0000 (10:17 +1100)

Trivial merge