Merge branch 'develop'
authorCuong Le <metacuong@gmail.com>
Wed, 24 Aug 2011 03:33:44 +0000 (10:33 +0700)
committerCuong Le <metacuong@gmail.com>
Wed, 24 Aug 2011 03:33:44 +0000 (10:33 +0700)

Trivial merge