Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Sat, 22 Nov 2008 02:20:33 +0000 (18:20 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 22 Nov 2008 02:20:33 +0000 (18:20 -0800)
commitdcc4661d4ab55526444f742a2f9634ec14832054
treed9a7f39cecad48e2ead374e8a7ef20f1feb8c38a
parentecd8c5d3078f4fd06586485665f956520b2314a3
parent3d30d5945cf561c5baf2716d8f41870cecf947c0
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba