Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 21:48:57 +0000 (08:48 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 21:48:57 +0000 (08:48 +1100)
commit04db9b184491415b3479fd79e1c07ba738818eb9
treea4c173e46d6ff080a56b418bdc794ed2970d9644
parentcda4642a937d249399e25eaa6e5e20a0d440bcbf
parent16f36ce499e93860dd535034a584ec2b93e7a172
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local