Merge remote branch 'epico/master'
authorPeng Huang <shawn.p.huang@gmail.com>
Tue, 23 Feb 2010 05:27:29 +0000 (13:27 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Tue, 23 Feb 2010 05:27:29 +0000 (13:27 +0800)

Trivial merge