From: Ryan Niebur <ryanryan52@gmail.com>
Date: Mon, 8 Mar 2010 05:42:00 +0000 (-0800)
Subject: Merge commit 'upstream/0.2.4'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4435df3d8d162aff3c6e9276ff291d2bb6cb0a9a;p=midori

Merge commit 'upstream/0.2.4'
---

4435df3d8d162aff3c6e9276ff291d2bb6cb0a9a