Merge branch 'develop'
authorCuong Le <metacuong@gmail.com>
Sun, 28 Aug 2011 08:27:32 +0000 (15:27 +0700)
committerCuong Le <metacuong@gmail.com>
Sun, 28 Aug 2011 08:27:32 +0000 (15:27 +0700)

Trivial merge