Merge commit 'v3.0' into diablo-package
authorSteven Luo <steven+maemo@steven676.net>
Wed, 23 Dec 2009 11:40:22 +0000 (03:40 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Wed, 23 Dec 2009 11:40:22 +0000 (03:40 -0800)

Trivial merge