Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Wed, 26 May 2010 12:43:43 +0000 (15:43 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Wed, 26 May 2010 12:43:43 +0000 (15:43 +0300)

Trivial merge