Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jan 2008 23:53:14 +0000 (10:53 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jan 2008 23:53:14 +0000 (10:53 +1100)
commit11061499e182b9c41ec793d4eefb8a2cf7c88bfe
treefa08fcbf21143655eb85ba79c6169b3b2eb24fdd
parent27b3c24040b1a7aa88413c477a3769bcd6847d72
parent24efc9fc36194d379838eb9911b65e93535da19b
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 74220ca244865f97825cabdbc8aa899e71c25c7d)