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)
commitf14721a0488449df06a6b8dbeedfdb18ba0d8745
treed03d4d158994d80762cfa9eaac6c4455e6a210d5
parenta39df128ef39e554add0303e49d19265ba3e0767
parent4426a6e201e88459830f194617af1d5dd14ed3ef
Merge commit 'v3.2' into test-branch