Merge branch 'hotfix/20130211_1' into develop
fix compile error
Merge branch 'hotfix/20130211_2'