Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 24 Oct 2008 14:38:44 +0000 (16:38 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 24 Oct 2008 14:38:44 +0000 (16:38 +0200)
commit791f9e09b82b5382f6005482a4e3faa62ce30fae
tree30f148a1d9aabadddbe35b974f75ae767b17e3a5
parent23302413b3fc9cb3695a255b1ea6883f029b46fe
parent2a76f4d8c832155253be971975b0ac50649c7515
Merge branch 'master' of ssh://git.samba.org/data/git/samba