Merge branch 'develop'
authorCuong Le <metacuong@gmail.com>
Wed, 24 Aug 2011 17:41:12 +0000 (00:41 +0700)
committerCuong Le <metacuong@gmail.com>
Wed, 24 Aug 2011 17:41:12 +0000 (00:41 +0700)

Trivial merge