Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 22 Dec 2008 15:33:06 +0000 (16:33 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 22 Dec 2008 15:33:06 +0000 (16:33 +0100)
commit8475d18641e407ad13b0529e788bd472018a5cc2
treea702c025b4e02ed2e3db7b8330d9aada32515538
parenta071290606a99f9975800ae97e60361c07a741c6
parent84501f6b59e7903581deb87c7612f0a879cfb576
Merge branch 'master' of ssh://git.samba.org/data/git/samba