Merge remote branch 'origin/master'
authorPeng Huang <shawn.p.huang@gmail.com>
Thu, 15 Apr 2010 07:26:31 +0000 (15:26 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Thu, 15 Apr 2010 07:26:31 +0000 (15:26 +0800)

Trivial merge