Merge commit 'v3.1' into diablo-package
authorSteven Luo <steven+maemo@steven676.net>
Fri, 15 Jan 2010 09:53:03 +0000 (01:53 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Fri, 15 Jan 2010 09:53:03 +0000 (01:53 -0800)

Trivial merge