Merge commit 'v3.0rc1' into diablo-package
authorSteven Luo <steven+maemo@steven676.net>
Fri, 18 Dec 2009 11:28:39 +0000 (03:28 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Fri, 18 Dec 2009 11:28:39 +0000 (03:28 -0800)

Trivial merge