Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 06:20:03 +0000 (17:20 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 06:20:03 +0000 (17:20 +1100)
commitae9d0343e0599ac62c3011a3d6c1948a9cb7a8f1
tree471f26b2ed8f768ecf8005f42c70a2f70d8975c8
parentfa1098959ad0016770ce1c327665df08ce3f69d2
parentc8b0a8a196d8d187a86aef497953d0105436aff8
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local