From: Yves-Alexis Perez <corsac@debian.org>
Date: Sat, 19 Feb 2011 23:03:14 +0000 (+0100)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1fad44a43061e4ede518921c99e2143d397fe19;p=midori

Merge branch 'upstream-unstable'
---

c1fad44a43061e4ede518921c99e2143d397fe19