Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Thu, 6 Mar 2008 11:02:25 +0000 (22:02 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 6 Mar 2008 11:02:25 +0000 (22:02 +1100)
commiteacf38cdb6c37d6fe979f2521a0baa1a66c6ddb5
tree01a39755724bd682c37a7a92634a8a3c6e5f2cbe
parent7e0ef3fd0ef4dba827f331cbe43fa0524be91130
parent0e50fb5e917117de22c5b3c32865d8a40285e362
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 2232255ce384433ff9626f2fd3d399f758b0add5)