Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 05:39:03 +0000 (16:39 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 05:39:03 +0000 (16:39 +1100)
commitf0a4db22e58d393be5b28f767ee6d0abfc8f11dc
tree995c6de26862dbbe14b23b75874a8ce4e265c624
parent74220ca244865f97825cabdbc8aa899e71c25c7d
parent079200b824de6dd8c7de3e5b76ed1805fde02965
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet