Merge branch 'master' of git+ssh://git.samba.org/data/git/samba
authorJohn H Terpstra <jht@samba.org>
Wed, 16 Jun 2010 13:57:44 +0000 (08:57 -0500)
committerJohn H Terpstra <jht@samba.org>
Wed, 16 Jun 2010 13:57:44 +0000 (08:57 -0500)
commit7af7e94952cf551656b538993ec511533299e632
tree16e6b72ac2d0aad2aa26b6932d67fed52544332d
parent50882e2077f20731c14e1687c09d785633e200ee
parent12fdfc94307b5f1b7982fc82c525b260806c8323
Merge branch 'master' of git+ssh://git.samba.org/data/git/samba