From: Yves-Alexis Perez <corsac@debian.org>
Date: Mon, 20 Sep 2010 06:39:35 +0000 (+0200)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeae2420c6f5e5e196e0383189bd32a805efd4dd;p=midori

Merge branch 'upstream-unstable'
---

aeae2420c6f5e5e196e0383189bd32a805efd4dd