Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Tue, 11 Nov 2008 18:20:24 +0000 (10:20 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 11 Nov 2008 18:20:24 +0000 (10:20 -0800)
commit4f2635b729e636e123afacb0970c3d49343b3e90
tree76d632982f23f08b23593af78614e9414dbbac2c
parent8cb23a6b2950d7419767845b6097470f76f348a7
parent2e6bf03e519e180a1ee672dc9c9171d9e0cd114f
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba