Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sat, 20 Dec 2008 23:11:50 +0000 (00:11 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 20 Dec 2008 23:11:50 +0000 (00:11 +0100)
commit40510348299e3b7b5bcebdb39072f2a44316c806
treefda159a1b6408c0c41e362700cc09a10255c7dc5
parent13fa639a29a3e79d825a9b75ac507285e39ff364
parent42b7762f9b69b543038ad1bb754e3d9a813704db
Merge branch 'master' of ssh://git.samba.org/data/git/samba