Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Fri, 4 Jun 2010 09:29:41 +0000 (12:29 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Fri, 4 Jun 2010 09:29:41 +0000 (12:29 +0300)

Trivial merge