Merge branch 'master' into git-po

Jiang Xin committed Feb 28, 2012 at 12:23 UTC 508d1244dc8d38188c70e98207efa8a97d16b47c

No changes.