Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 12:25:22 +0000 (14:25 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 12:25:22 +0000 (14:25 +0200)
commit7d38a51af9125ec2c98679416012fbbe721568f5
treedc2ee664d322b8aecedaec3a67df6768fcae3734
parentca2e4a0e14a005843d19514d924e5adc924c5c5d
parentd7034765b765e6ac522aed6ab5d0f52b5a2ed033
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 8d9812bada2801f93eb47270287b3c083a3e9df8)