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