Merge pull request #1 from xiaoqiang0/master
authorJF Ding <jfding@gmail.com>
Wed, 14 Dec 2011 05:58:40 +0000 (21:58 -0800)
committerJF Ding <jfding@gmail.com>
Wed, 14 Dec 2011 05:58:40 +0000 (21:58 -0800)
Fix two bugs.


Trivial merge