Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Fri, 18 Jun 2010 08:47:08 +0000 (11:47 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Fri, 18 Jun 2010 08:47:08 +0000 (11:47 +0300)

Trivial merge