Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 04:22:22 +0000 (15:22 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 04:22:22 +0000 (15:22 +1100)
commit53b51660ae6b733b19b0ba3403f229b215de7b47
tree346b33fb5d9bd58a374920975295b04c37152d21
parentf917ccec85f854423f423bbffc41459d92960a1b
parentcbf3b74e5f5076d864b08c772f21b20751ea5163
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local