Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 3 Mar 2008 00:12:20 +0000 (11:12 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 3 Mar 2008 00:12:20 +0000 (11:12 +1100)
commitde1784ec4d50f6eec24b1e9e488b5c07833dc1fd
treeacd305f4bb9ce81d8d77b0a83602bf51f2a471d0
parent62536750ae06248a49c6b56c86d01b0062bb54f0
parent3d4cbaeec6eafc0fec06ba472ac2bd55ae3a0d11
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local