Merge branch 'develop'
authorCuong Le <cuonglb@ideapad.(none)>
Fri, 9 Sep 2011 08:19:27 +0000 (15:19 +0700)
committerCuong Le <cuonglb@ideapad.(none)>
Fri, 9 Sep 2011 08:19:27 +0000 (15:19 +0700)

Trivial merge