Merge pull request #2 from jkugler/master
authorSong Liu <leopku@qq.com>
Tue, 12 Jul 2011 12:49:04 +0000 (05:49 -0700)
committerSong Liu <leopku@qq.com>
Tue, 12 Jul 2011 12:49:04 +0000 (05:49 -0700)
New functionality


Trivial merge