Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 Jan 2009 15:19:39 +0000 (16:19 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 Jan 2009 15:19:39 +0000 (16:19 +0100)
commitbfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b
tree068b3849e31c7b90a465be8172aac7c2b472d205
parent5cf9989a70a23e5b955b7229fa95d3e604b1883d
parentc45b6ec29a5b3a39b83209e970b645e5ed0a411c
Merge branch 'master' of ssh://git.samba.org/data/git/samba