Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
commit2f04b7d29a9e93152ff40a04afa50d3755ff0a25
authorAndrew Bartlett <abartlet@samba.org>
Thu, 2 Apr 2009 21:28:22 +0000 (3 08:28 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 2 Apr 2009 21:28:22 +0000 (3 08:28 +1100)
treeccef6bba0937d61bd461335e510db9813b5c24ce
parent354ba5e2e35c0adb2dd04f81a6ce7d1d721f31dc
parent31ab1d6a6487fb442ccd5b2cd093b4a2b7b80291
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema