Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
authorAndrew Bartlett <abartlet@samba.org>
Tue, 31 Mar 2009 23:25:03 +0000 (10:25 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 31 Mar 2009 23:25:03 +0000 (10:25 +1100)
commit8680be7059280186e59cf4a995f249b62a5a36d4
tree55d091a58efc08fc99b44e7704f883108fdaca5e
parent2fe17ae61e4f80b7c864bd6777c71557c97c0125
parent62f12e2322f1f14cf359fa39a822cd478256cf01
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema