Merge branch 'develop' master
authorCuong Le <metacuong@gmail.com>
Mon, 19 Sep 2011 08:14:38 +0000 (15:14 +0700)
committerCuong Le <metacuong@gmail.com>
Mon, 19 Sep 2011 08:14:38 +0000 (15:14 +0700)

Trivial merge