merge

git-svn-id: https://svn.sinaapp.com/dilan/1@1210 288da536-3c93-4ab2-bc2e-17a84f795b60
merge

git-svn-id: https://svn.sinaapp.com/dilan/1@1211 288da536-3c93-4ab2-bc2e-17a84f795b60
Merge branch 'master' of github.com:fainle/sae_python_blog
merge