Merge branch 'develop' v1.0.2-4
authorCuong Le <cuonglb@ideapad.(none)>
Fri, 16 Sep 2011 13:28:43 +0000 (20:28 +0700)
committerCuong Le <cuonglb@ideapad.(none)>
Fri, 16 Sep 2011 13:28:43 +0000 (20:28 +0700)

Trivial merge