Merge branch 'develop' v1.0.2-6
authorCuong Le <metacuong@gmail.com>
Fri, 16 Sep 2011 16:17:29 +0000 (23:17 +0700)
committerCuong Le <metacuong@gmail.com>
Fri, 16 Sep 2011 16:17:29 +0000 (23:17 +0700)

Trivial merge