Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 30 Jan 2008 00:47:52 +0000 (11:47 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 30 Jan 2008 00:47:52 +0000 (11:47 +1100)
commit3231717e1485c70890c23fbfc3087d970a408815
tree6bf9ab10ca4e42e0786fae7f1f7f15bf39a9a5c3
parent9cc90f67b3fc4a16a2029a1cb1d98286ae598966
parent61379d97cd3f4f21cc55d3cf3539e0adfa274b7f
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 8011716734cb8e3c34f85d9d68201f13cb5b8e0a)