Merge branch 'develop'
authorCuong Le <metacuong@gmail.com>
Thu, 25 Aug 2011 08:09:14 +0000 (15:09 +0700)
committerCuong Le <metacuong@gmail.com>
Thu, 25 Aug 2011 08:09:14 +0000 (15:09 +0700)

Trivial merge