Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 4 Feb 2008 22:16:37 +0000 (09:16 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 4 Feb 2008 22:16:37 +0000 (09:16 +1100)
commit7fc3669b9dc34514d8749d3941514fdae7d0f700
treef2adc820354539da51b35dcb6981c16f2e61a152
parentc3387545c57d2dd4922b4f3806b4552cee8035a3
parent145d6c8ea0eafc69cdeca45fbf296148b890133d
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet