From: Steven Luo <steven+maemo@steven676.net>
Date: Fri, 11 Dec 2009 00:52:21 +0000 (-0800)
Subject: Merge branch 'master' into diablo-package
X-Git-Tag: diablo-package-2.2-1~8
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=848751e124943562aab29c19fd4b08dc5d06ec2f

Merge branch 'master' into diablo-package
---

848751e124943562aab29c19fd4b08dc5d06ec2f