Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Thu, 20 Nov 2008 00:36:59 +0000 (16:36 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 20 Nov 2008 00:36:59 +0000 (16:36 -0800)
commitbc070b1c14a4405a7bf2b63f434503397d1d73e4
treeba7cfe3d2d4d77420dd360e6862ea1b91bc3295e
parent804e63909bc3c9e4e2ca67f67eb56a1422f85fba
parent54e832c171e7763483a5ad872b23c89496477767
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba