Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Mon, 20 Oct 2008 23:38:25 +0000 (16:38 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 20 Oct 2008 23:38:25 +0000 (16:38 -0700)
commit29c9b88e2bb5d3f585e7aa591870e8b39a0d23c9
tree761e1b6c8172470d651c7760806ce5081f5ee55f
parent6aba3516769b944e7960d27f10799bb8a8898d2d
parentcefe4c66970b8ca243595cdb940a7c1a26765a08
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba