From: Yves-Alexis Perez <corsac@debian.org>
Date: Mon, 1 Nov 2010 20:32:31 +0000 (+0100)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=436f1b1b23db9bb96b68266c8ced466394674ca2;p=midori

Merge branch 'upstream-unstable'
---

436f1b1b23db9bb96b68266c8ced466394674ca2