Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Tue, 24 Feb 2009 20:35:33 +0000 (12:35 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 24 Feb 2009 20:35:33 +0000 (12:35 -0800)
commitc21d54f913c770f3530de500768919a2debbcc61
treed01951fdfed3edf7f448b42e1b24c3fe4c0c269f
parent3a88316e233079199117731756d35d0aea4670e4
parente3746ac922c29f90d0dbb23a76f5387daf21c8c3
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba