From: Ryan Niebur <ryanryan52@gmail.com>
Date: Sun, 30 May 2010 17:53:37 +0000 (-0700)
Subject: Merge commit 'upstream/0.2.6'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bb363ff33150552705125493e4c9acb2ae6dbeb;p=midori

Merge commit 'upstream/0.2.6'
---

8bb363ff33150552705125493e4c9acb2ae6dbeb