ci 2013-05-23
Merge branch 'master' of github.com:lilijreey/Linux-learning