Merge commit 'v3.1' into fremantle-package
authorSteven Luo <steven+maemo@steven676.net>
Fri, 15 Jan 2010 10:40:59 +0000 (02:40 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Fri, 15 Jan 2010 10:40:59 +0000 (02:40 -0800)

Trivial merge