Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 14 Aug 2008 21:58:03 +0000 (07:58 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 14 Aug 2008 21:58:03 +0000 (07:58 +1000)
commitac503b140d6d69b6341be2e80ba535d7cfc7a73d
tree8bf3d874f09486b71fb0d2faaf37d4cd5cc3d00a
parentcb98944be3fd24a9ee9c7b4cef3732e68a8c1627
parentc1c6c1b609ab57186dab7b13c56bfe4475a733f7
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit b337369d5c86b37d93ee1c62880068e14d6c09f6)