Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 10 Sep 2008 04:09:07 +0000 (14:09 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 10 Sep 2008 04:09:07 +0000 (14:09 +1000)
commit9bc4d3ecba6395be2dff195fdc1ae74d07155a42
tree354e6216080b6e21cdc2ff2e5368ee4a99aa535b
parentba22de3d4fcba466d2829df47fb05c85eda2f98f
parentce288824bb4a095c5020449a79eb83fad81e8480
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit ed26195d0eda6dd1ca14508cfd31a48dde79d44f)