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)
commit1bc9c3923574d548810733b512716d5758814328
treeaa128b82d3232a8c73de316aa5a7b8bd0caa9766
parent2fe17ae61e4f80b7c864bd6777c71557c97c0125
parent36c1a52a57bc96c7586ca1bffbe8ef47c93bca1b
Merge commit 'master/master' into wspp-schema