Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 31 Oct 2008 23:34:39 +0000 (00:34 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 31 Oct 2008 23:34:39 +0000 (00:34 +0100)
commit72a1e3acfa5789134a28fb0609bc88b25c0e0b15
treee7a7e8aaddbae9a97543d5b13bc16ce2e154c134
parent59206674521065e041a6020f9ba793fac47b1d7d
parentff274e57eacb9ac4c81adfcfea4f7b4b668a7d94
Merge branch 'master' of ssh://git.samba.org/data/git/samba