Merge commit 'v2.2' into diablo-package
authorSteven Luo <steven+maemo@steven676.net>
Mon, 14 Dec 2009 11:22:29 +0000 (03:22 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Mon, 14 Dec 2009 11:22:29 +0000 (03:22 -0800)

Trivial merge