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

Trivial merge