Merge branch 'v3-4-test' of ssh://jra@git.samba.org/data/git/samba into v3-4-test
commite1041f5957e84b6c255c714b2bf6056cdc8f3323
authorJeremy Allison <jra@samba.org>
Tue, 17 Mar 2009 22:38:07 +0000 (17 15:38 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 17 Mar 2009 22:38:07 +0000 (17 15:38 -0700)
tree7198b0d9d3decae1b100691afc2801d0de7f42c4
parent49399cb3cc09213c6c44799e17d7a95afc8c8584
parent28f233ddc010893f50b45f91ce41deaa537f11d7
Merge branch 'v3-4-test' of ssh://jra@git.samba.org/data/git/samba into v3-4-test