Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 26 Mar 2009 22:33:40 +0000 (15:33 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 26 Mar 2009 22:33:40 +0000 (15:33 -0700)
commit0788436b579b78088bfa9d77fb4c47f652ad5eb8
tree318a8c48636c57650c0210653f52725c252d612c
parent1f83aafac85fad3f996f1dfd92e553b030de50d0
parent049534336c8df538ab3c384c0f505cf3bc6a1300
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba