Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jan 2008 22:00:04 +0000 (09:00 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jan 2008 22:00:04 +0000 (09:00 +1100)
commitd8a805a2544c8864136f77e9086b2a01ae79a1d5
tree3094c0613912b7696707ce74d6fbc28d2f9780b7
parentb0657e068148eb0e5f1d69d125faaa29acb8d379
parent9cff25cce1d39460dbcab006a309bb2984969eed
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local