Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 19 Dec 2008 22:51:23 +0000 (23:51 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 19 Dec 2008 22:51:23 +0000 (23:51 +0100)
commit9617a3945b804bf2d1409285df2a7add12690063
treeb6506c7f5ed050900b511bbffb52df3544bda505
parent0898b96d26981d553e041a78721e32946bd4bddf
parentd26a34c22f5d2685f8e75149f87db8d086e32e13
Merge branch 'master' of ssh://git.samba.org/data/git/samba