Merge remote branch 'epic/master'
authorPeng Huang <shawn.p.huang@gmail.com>
Fri, 9 Jul 2010 07:36:04 +0000 (15:36 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Fri, 9 Jul 2010 07:36:04 +0000 (15:36 +0800)

Trivial merge