Merge branch 'master' of http://git.pingu.fi/matrix
authorTimo Savola <tsavola@movial.fi>
Tue, 10 Jun 2008 11:44:50 +0000 (14:44 +0300)
committerTimo Savola <tsavola@movial.fi>
Tue, 10 Jun 2008 11:44:50 +0000 (14:44 +0300)

Trivial merge