Merge commit 'definite/master'
authorPeng Huang <shawn.p.huang@gmail.com>
Fri, 17 Apr 2009 06:19:05 +0000 (14:19 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Fri, 17 Apr 2009 06:19:05 +0000 (14:19 +0800)

Trivial merge