Merge branch 'master' of github.com:wmvanvliet/Chimara
authorPhilip Chimento <philip.chimento@gmail.com>
Tue, 11 Jan 2011 20:01:41 +0000 (15:01 -0500)
committerPhilip Chimento <philip.chimento@gmail.com>
Tue, 11 Jan 2011 20:01:41 +0000 (15:01 -0500)

Trivial merge