Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 23:59:14 +0000 (10:59 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 23:59:14 +0000 (10:59 +1100)
commit81a0a7967b8f659f1f35a7a25de469725417ab43
tree92e3f7cb0bd5bc36169618e65d222fbcd1133388
parentf0a4db22e58d393be5b28f767ee6d0abfc8f11dc
parentf5ea5de797f4fe35baf4f2bcd2913902c6703f44
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet