Merge branch 'master' of ssh://git.samba.org/data/git/samba into franky
authorJelmer Vernooij <jelmer@samba.org>
Mon, 15 Sep 2008 16:00:55 +0000 (18:00 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 15 Sep 2008 16:00:55 +0000 (18:00 +0200)
commit9c455879f02606127686cde50552af53ccff8cb8
tree4ec210a90d7f0476ff4bf33fc7ab53fbaadb7b13
parenta3a4c9a1fd7ab6d8d4dc5af3727d43bb22f1219c
parentc4f361a17f51e4897ac2faafc65ebc8349e19001
Merge branch 'master' of ssh://git.samba.org/data/git/samba into franky