Merge commit 'v3.2' into test-branch
authorSteven Luo <steven+maemo@steven676.net>
Mon, 22 Feb 2010 10:03:38 +0000 (02:03 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Mon, 22 Feb 2010 10:03:38 +0000 (02:03 -0800)

Trivial merge