Merge commit 'definite/master'
authorPeng Huang <shawn.p.huang@gmail.com>
Mon, 24 Aug 2009 08:11:07 +0000 (16:11 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Mon, 24 Aug 2009 08:11:07 +0000 (16:11 +0800)

Trivial merge