Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Tue, 1 Jun 2010 12:16:01 +0000 (15:16 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Tue, 1 Jun 2010 12:16:01 +0000 (15:16 +0300)

Trivial merge