Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jul 2008 08:39:37 +0000 (18:39 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jul 2008 08:39:37 +0000 (18:39 +1000)
commitade9b6c455518c8bc1b49cb6fe87aa6de7b36868
treecdd5c76c7dde8daa5d406da2cd3dc4124837c875
parentda9ab5756e1256a9c6e1188f7510ca5d84cbe4f9
parent0299edbc02f4185020bae8e66c02d1081d07279f
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 486891bb5167034e54b7477ba09e8f5f914b93e4)