roll back to 2013.07.08
Merge branch 'master' of https://github.com/yison/giraffe_win