Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 19 Aug 2008 04:10:53 +0000 (14:10 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 19 Aug 2008 04:10:53 +0000 (14:10 +1000)
commit27d07df301d60e49d36efd003f2fd2305c83c3fe
tree505db4581351afeb29d15c022ea3e39870a6d684
parent423db2468ba3dac89cebc59c8498c0b08c5f3d7b
parentf48dfd87badcddc64a1c0bf52939188a4a8f4add
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet