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

Trivial merge