Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 02:16:08 +0000 (13:16 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 02:16:08 +0000 (13:16 +1100)
commit597f9fe17685fb7909269bc0af04bf4a040e2ad7
tree1693cdfa01201ebffaac947f5d771e18dd827b0d
parent8099facff99dab4de27ea6f857d0e8f5eaa3db5a
parentb27e5a68530c4fd6430cbb174b63f8ff2b6f4e53
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local