Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Wed, 9 Jan 2008 01:59:46 +0000 (17:59 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 9 Jan 2008 01:59:46 +0000 (17:59 -0800)
commit6ce07b63f119aceb8af3740c024fde1df9121a4c
tree1a5711ac1358cce8f38ba9068477eed8b46fdcab
parentb65a166132e6834f8111c3e41579f5e1e68e0ec6
parent514991a4acc55c721e6ad8b5a27106ab35ea5d45
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test