Merge remote branch 'definite/master'
authorPeng Huang <shawn.p.huang@gmail.com>
Mon, 14 Dec 2009 08:41:37 +0000 (16:41 +0800)
committerPeng Huang <shawn.p.huang@gmail.com>
Mon, 14 Dec 2009 08:41:37 +0000 (16:41 +0800)

Trivial merge