Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 21:48:57 +0000 (08:48 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 21:48:57 +0000 (08:48 +1100)
commit3eef0664c59c7afef117132c1d2ebccf22ad748e
tree17f4ae2a47cc7d3bac266f5ca2033140e6a4e81e
parent3abf47fe87e72b18c94157c3f993b7f2fca8c248
parent2ba62662f8e2578153be3125eb557b9349ccfd3b
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 04db9b184491415b3479fd79e1c07ba738818eb9)