Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Wed, 2 Jun 2010 10:20:02 +0000 (13:20 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Wed, 2 Jun 2010 10:20:02 +0000 (13:20 +0300)

Trivial merge