From: Yves-Alexis Perez <corsac@debian.org>
Date: Mon, 2 May 2011 05:58:23 +0000 (+0200)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07394c033772a6a20c16c0377fd6d9cd00f56dbb;p=midori

Merge branch 'upstream-unstable'
---

07394c033772a6a20c16c0377fd6d9cd00f56dbb