Merge branch 'develop'
authorCuong Le <cuonglb@ideapad.(none)>
Fri, 16 Sep 2011 14:09:43 +0000 (21:09 +0700)
committerCuong Le <cuonglb@ideapad.(none)>
Fri, 16 Sep 2011 14:09:43 +0000 (21:09 +0700)

Trivial merge