Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 7 Jan 2009 20:45:49 +0000 (21:45 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 7 Jan 2009 20:45:49 +0000 (21:45 +0100)
commit66fa21ef73464188f5cb20e5fc96c5aa35d434b6
treefa54883af4c07ac6886222aa751e97efe2753f8c
parentea1ff069a53a53b0251179dca30ce52dd8b56a23
parent45c67ff244a4a40b8fd099b3cbdc135a527c30eb
Merge branch 'master' of ssh://git.samba.org/data/git/samba