Merge commit 'v2.1' into stable-2.x

v2.1 is identical to 8c34ed7e3b which was
HEAD at the time of the 2.1 release, but with the top 2 commits in
reverse order.
This commit is contained in:
Arun Raghavan 2012-09-25 02:30:46 +08:00
commit 4636f56090

Diff content is not available