Merge branch 'develop' v1.0.2-7
authorCuong Le <metacuong@gmail.com>
Sat, 17 Sep 2011 03:47:08 +0000 (10:47 +0700)
committerCuong Le <metacuong@gmail.com>
Sat, 17 Sep 2011 03:47:08 +0000 (10:47 +0700)

Trivial merge