Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 00:19:00 +0000 (02:19 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 00:19:00 +0000 (02:19 +0200)
commit7e5bbe806958ea8176e4c8494e3b3f79570635da
treea42ca35a8c4ce5bb31a2bc934062e41c2f734b53
parentfd443f819e77ee811cbcd0eaea4073f5e7a8f145
parent551e95502765bae58d5ccf57635e4977b7b47b9b
Merge branch 'master' of git://git.samba.org/samba