Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 00:10:19 +0000 (11:10 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 00:10:19 +0000 (11:10 +1100)
commitddf9d6ef70f0a6b7da420f772b34962fb25d761a
tree56fcb0cc76719632c867aa6269e020489c3dec42
parent092592233fe02d0c05933bafd52d790a9561cf9b
parentb6c61bee649734f6000fbf3fe3736d8c82155ac9
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local