Merge branch 'master' into develop
authorCuong Le <cuonglb@ideapad.(none)>
Sat, 10 Sep 2011 16:26:45 +0000 (23:26 +0700)
committerCuong Le <cuonglb@ideapad.(none)>
Sat, 10 Sep 2011 16:26:45 +0000 (23:26 +0700)

Trivial merge