From: Ryan Niebur <ryanryan52@gmail.com>
Date: Thu, 24 Dec 2009 23:50:21 +0000 (-0800)
Subject: Merge commit 'upstream/0.2.2'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=299246f190fcb4c8786eb6177b211027dcad2f75;p=midori

Merge commit 'upstream/0.2.2'
---

299246f190fcb4c8786eb6177b211027dcad2f75