Merge commit 'v3.3' into diablo-package
authorSteven Luo <steven+maemo@steven676.net>
Fri, 3 Sep 2010 04:43:10 +0000 (21:43 -0700)
committerSteven Luo <steven+maemo@steven676.net>
Fri, 3 Sep 2010 04:43:10 +0000 (21:43 -0700)

Trivial merge