From: Yves-Alexis Perez <corsac@debian.org>
Date: Tue, 15 Mar 2011 18:31:36 +0000 (+0100)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eb96432700af7e19e84a67093fbba577c884c1e;p=midori

Merge branch 'upstream-unstable'
---

3eb96432700af7e19e84a67093fbba577c884c1e