Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 8 Oct 2009 22:36:24 +0000 (15:36 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 8 Oct 2009 22:36:24 +0000 (15:36 -0700)
commit5c4fea6d72ab06ffbe144a7a7581d710a2b3cc7c
tree7b17d6901b3e2ab2ef069e5f3abcf74672cd9ccd
parent77abc2dabd0477bf283793389da5add19aa42de1
parent76f73c73eacce99f0d9479f72dcf39b45418c646
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba