Merge branch 'master' of github.com:wmvanvliet/Chimara
authorP. F. Chimento <philip.chimento@gmail.com>
Sat, 15 Jan 2011 12:10:07 +0000 (13:10 +0100)
committerP. F. Chimento <philip.chimento@gmail.com>
Sat, 15 Jan 2011 12:10:07 +0000 (13:10 +0100)

Trivial merge