Merge remote branch 'intgit/master'
authorMarko Kreen <[email protected]>
Fri, 25 May 2012 14:16:38 +0000 (17:16 +0300)
committerMarko Kreen <[email protected]>
Fri, 25 May 2012 14:16:38 +0000 (17:16 +0300)

Trivial merge