Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jul 2008 06:15:43 +0000 (16:15 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jul 2008 06:15:43 +0000 (16:15 +1000)
commita93b20b85b7b35965c428f1543cb7bbe96e16d42
tree8d596ca0cfee56cb31c2ef01dc69f15ed5a89f9a
parent136a85599815670c807f212d7d4003ec53a13729
parentb91bbc5fe4a47e5823be6be5f2f203f1f14105de
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet