Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 8 Jan 2009 14:47:34 +0000 (15:47 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 8 Jan 2009 14:47:34 +0000 (15:47 +0100)
commit8c18d3a3164d36b3a3cdc09bb426e42e942d7e2e
tree3f866bac1cb1e8a120eccf819a553d83ac21f1b6
parent2c1cd0c9fefc43124472f605694b11812d3d5d87
parent260c4e17e8bbb5feee2a5685e3acd887562c2bba
Merge branch 'master' of ssh://git.samba.org/data/git/samba