Merge commit 'tmpl/master'
authorHuang Peng <shawn.p.huang@gmail.com>
Tue, 15 Jul 2008 05:44:29 +0000 (13:44 +0800)
committerHuang Peng <shawn.p.huang@gmail.com>
Tue, 15 Jul 2008 05:44:29 +0000 (13:44 +0800)

Trivial merge