Merge branch 'master' into develop
[lichviet] / main.cpp
2011-08-23 Cuong LeSource init for master branch.