Merge branch 'v4-0-test' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 03:14:25 +0000 (14:14 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 03:14:25 +0000 (14:14 +1100)
commitf39af7c2c35abb794e1dc1a496c1960221f006f2
treecc6aedaddfb64789c7c042a1866a4c9124543406
parenteefd46289b90967ce6b4cd385fb1f7e1d6f9b343
parent66efff41a72190ad73512cbf08fa68b1b44406b9
Merge branch 'v4-0-test' of git://git.id10ts.net/samba into 4-0-local