Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
commit9f71be12504495f92ed495279a977274462738a9
authorJeremy Allison <jra@samba.org>
Wed, 25 Jun 2008 22:24:18 +0000 (25 15:24 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 25 Jun 2008 22:24:18 +0000 (25 15:24 -0700)
tree8b41f84ed920068cf2c898b7f8fde74663fa8d05
parentae16606a90291664c7e43ea9316af3167a2d7642
parent7139745b018a3d2304aff24a5baef97ec750256a
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
(This used to be commit 9075c5f2ada8f96ae8d6cbcfc36663969e9bf34f)