Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jeremy@jeremy-desktop.(none)>
Tue, 23 Dec 2008 18:43:02 +0000 (10:43 -0800)
committerJeremy Allison <jeremy@jeremy-desktop.(none)>
Tue, 23 Dec 2008 18:43:02 +0000 (10:43 -0800)
commit7e1f0e272ca2db577a929a2bbef651cf5759535e
tree7a2dd5054536abcc7fd0590f95283243cbc497c8
parentaa4abac6b73db7be694bc9f6f097092271357d20
parent5dce4148a3d30cbc0ca434049761434c5cc8cb33
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba