Merge branch 'master' of ssh://mercury/var/git/irwi
authorJari Jarvi <t7jaja00@students.oamk.fi>
Tue, 13 Jul 2010 09:59:37 +0000 (12:59 +0300)
committerJari Jarvi <t7jaja00@students.oamk.fi>
Tue, 13 Jul 2010 09:59:37 +0000 (12:59 +0300)

Trivial merge