Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Wed, 19 Nov 2008 23:06:05 +0000 (15:06 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 19 Nov 2008 23:06:05 +0000 (15:06 -0800)
commit804e63909bc3c9e4e2ca67f67eb56a1422f85fba
tree32a567b8ecfbafbe5938fd9a99a3565c2eeb77e6
parent31a8c4df1305b63729e49a61e27bc9e1825af0d0
parentf9d691d9d808ec2f91f3f469fe2201b0909a8552
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba