Merge branch 'develop'
authorCuong Le <metacuong@gmail.com>
Fri, 23 Sep 2011 06:45:03 +0000 (13:45 +0700)
committerCuong Le <metacuong@gmail.com>
Fri, 23 Sep 2011 06:45:03 +0000 (13:45 +0700)

Trivial merge