Merge branch 'master' of github.com:wmvanvliet/Chimara
authorP. F. Chimento <philip.chimento@gmail.com>
Sat, 13 Nov 2010 00:08:04 +0000 (01:08 +0100)
committerP. F. Chimento <philip.chimento@gmail.com>
Sat, 13 Nov 2010 00:08:04 +0000 (01:08 +0100)

Trivial merge