Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 24 Oct 2008 02:19:08 +0000 (04:19 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 24 Oct 2008 02:19:08 +0000 (04:19 +0200)
commit2cabbb2eeb7d62f8df1c4d20d90adbd53828dd8a
treee24ed30156017d899d106344be4e8fc8fcd59b10
parent9d679c9a67f6dcb1ed1597476c63c8adf3b3f426
parent0058176ae32eff7acb07c013d48cca294bd4bf82
Merge branch 'master' of ssh://git.samba.org/data/git/samba