Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 23:56:56 +0000 (10:56 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 23:56:56 +0000 (10:56 +1100)
commit124d2ee788f1ac4b201a2843b58be21de358deb0
tree8279669af7f6ebcc47a6849a53049d012f9e97c6
parentfaf324cac613f9b74e1de46fe490f4973dab995c
parent80ce9a3bbc43535d7c4bdd0ec402272175732ebc
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local