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)
commitf6a0b31c349065619a0154e9cb393ccefdf002c6
tree7913b667f3ea6b0a1a5b5c5c5545ec26ff428062
parent77624cc6f8c88bf92b177e1b97670bf10b8df2d1
parent6404fe2284ad15880100d45d1b2c0e097135fc1d
Merge pull request #1 from xiaoqiang0/master

Fix two bugs.