Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Thu, 8 Jul 2010 08:43:33 +0000 (11:43 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Thu, 8 Jul 2010 08:43:33 +0000 (11:43 +0300)

Trivial merge