Merge branch 'master' of ssh://mercury/var/git/irwi
authorJari Jarvi <t7jaja00@students.oamk.fi>
Thu, 1 Jul 2010 12:53:10 +0000 (15:53 +0300)
committerJari Jarvi <t7jaja00@students.oamk.fi>
Thu, 1 Jul 2010 12:53:10 +0000 (15:53 +0300)

Trivial merge