Merge remote-tracking branch 'gamato/master'
authorMarko Kreen <markokr@gmail.com>
Thu, 21 Mar 2013 16:59:14 +0000 (18:59 +0200)
committerMarko Kreen <markokr@gmail.com>
Thu, 21 Mar 2013 16:59:14 +0000 (18:59 +0200)

Trivial merge