Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
commitff7de4afe199b7e4a1b40a00bf5f817172ebbcbf
authorJeremy Allison <jra@samba.org>
Mon, 1 Dec 2008 21:32:35 +0000 (1 13:32 -0800)
committerJeremy Allison <jra@samba.org>
Mon, 1 Dec 2008 21:32:35 +0000 (1 13:32 -0800)
tree76663b0c0d322d5632557883b9e9c0929dcddc20
parent8edd7752447e178d2e99b23997d475790efb5af2
parent0b7430b0541af98fe3661069d93fafca42f321ec
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba