Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
commitf00d9cbfd752b6971e010a07d80937b322149520
authorJeremy Allison <jra@samba.org>
Thu, 18 Dec 2008 01:24:54 +0000 (17 17:24 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 18 Dec 2008 01:24:54 +0000 (17 17:24 -0800)
tree23bcdf13441502c80fdaa28250cf6bc3525ab574
parent1a5fc6d4bc847d9896500b704c9a8d5ac7faa7d2
parent8f2e7041a0ab94db88b5693f48455724e76261c6
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba