From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 15 Sep 2008 16:00:55 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba into franky
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=9c455879f02606127686cde50552af53ccff8cb8;hp=-c

Merge branch 'master' of ssh://git.samba.org/data/git/samba into franky
---

9c455879f02606127686cde50552af53ccff8cb8