Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Sun, 3 Feb 2008 22:56:24 +0000 (09:56 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 3 Feb 2008 22:56:24 +0000 (09:56 +1100)
commit377a7c633d4813c134b91739c507dcefb55c9691
treec45a7b52f107c7da3cadea9d96f0eef802890dfb
parent8011716734cb8e3c34f85d9d68201f13cb5b8e0a
parentec0ee2aa5f4bef32f09a426d91c28c985f843038
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet