Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 13:24:16 +0000 (14:24 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 13:24:16 +0000 (14:24 +0100)
commitd3199276eac8caa55c8334458d156fd4badae338
tree71e8d48b4ee545eab9ad50addbada3069f36f31e
parent1d59fd4d733007ccabb69c945e1da2208c376b96
parent157864d1e8cb069a3be0aadf71e114f9ae827df3
Merge branch 'master' of ssh://git.samba.org/data/git/samba