Merge branch 'develop' v1.0.2-5
authorCuong Le <metacuong@gmail.com>
Fri, 16 Sep 2011 15:25:30 +0000 (22:25 +0700)
committerCuong Le <metacuong@gmail.com>
Fri, 16 Sep 2011 15:25:30 +0000 (22:25 +0700)

Trivial merge