Merge commit 'v3.3b2' into diablo-package
authorSteven Luo <steven+maemo@steven676.net>
Sat, 28 Aug 2010 11:51:07 +0000 (04:51 -0700)
committerSteven Luo <steven+maemo@steven676.net>
Sat, 28 Aug 2010 11:51:07 +0000 (04:51 -0700)

Trivial merge