Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 06:20:03 +0000 (17:20 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 06:20:03 +0000 (17:20 +1100)
commite5d2ec1cb97d39a8056f34a4105fae5352677c1b
treea4eb973d2cdc8ebfa4f759c7dc59dcac1454a254
parent9e547f43036c2487e1a7e9fa3de9acb2d5bf579f
parent0efa783849ff4bd449cdcc5f643f0101d48746bb
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit ae9d0343e0599ac62c3011a3d6c1948a9cb7a8f1)