Merge commit 'definite/master'
authorPeng Huang <shawn.p.huang@gmail.com>
Tue, 28 Apr 2009 07:40:24 +0000 (15:40 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Tue, 28 Apr 2009 07:40:24 +0000 (15:40 +0800)

Trivial merge