Merge commit 'iwaim/master'
authorPeng Huang <shawn.p.huang@gmail.com>
Mon, 13 Apr 2009 04:34:14 +0000 (12:34 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Mon, 13 Apr 2009 04:34:14 +0000 (12:34 +0800)

Trivial merge