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

Trivial merge