Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 23:11:56 +0000 (01:11 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 23:11:56 +0000 (01:11 +0200)
commit98a6b91da57ba71a0fe971cb24b1647d5f0062e8
treef39dd68943cf859a13b5db64b3e206dc884ade6f
parent95a86edd97943aec086ed119975bad940c0cfe47
parentaed571d1687f5342cc9a0958e3b54f8016a2c526
Merge branch 'master' of git://git.samba.org/samba