Merge remote-tracking branch 'gamato/master'
authorMarko Kreen <[email protected]>
Fri, 9 Aug 2013 14:51:02 +0000 (17:51 +0300)
committerMarko Kreen <[email protected]>
Fri, 9 Aug 2013 14:51:02 +0000 (17:51 +0300)

Trivial merge