Merge branch 'master' into rewrite
authorHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Sat, 7 Aug 2010 16:08:10 +0000 (00:08 +0800)
committerHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Sat, 7 Aug 2010 16:08:10 +0000 (00:08 +0800)

Trivial merge