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)
commite9567e39106efb7443ed2c5df3492208b1c1d766
tree5a5adad8c4495b7de4c82092b077178165af6e5a
parentb2d9b03ba3434e76d4d476233a198728523d17f9
parent4d40f3a02643b4cdacee31f0b7bc9fc77cc9869a
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local