Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 12 Mar 2008 23:00:57 +0000 (10:00 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 12 Mar 2008 23:00:57 +0000 (10:00 +1100)
commit3d9056aa863c8e1307709bcbbdbd3305e9bfe62f
tree49224fa1f8e5bc488e01f709015ed37be9b9d898
parent07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01
parent50243cdbbda8a1f14e56c684281a93614aab0103
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit e9567e39106efb7443ed2c5df3492208b1c1d766)