Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorJoonas Partanen <t7pajo01@students.oamk.fi>
Tue, 8 Jun 2010 08:05:50 +0000 (11:05 +0300)
committerJoonas Partanen <t7pajo01@students.oamk.fi>
Tue, 8 Jun 2010 08:05:50 +0000 (11:05 +0300)

Trivial merge