Merge branch 'develop'
authorCuong Le <metacuong@gmail.com>
Fri, 23 Sep 2011 04:04:08 +0000 (11:04 +0700)
committerCuong Le <metacuong@gmail.com>
Fri, 23 Sep 2011 04:04:08 +0000 (11:04 +0700)

Trivial merge