Merge remote-tracking branch 'gamato/master'
authorMarko Kreen <markokr@gmail.com>
Wed, 27 Feb 2013 15:48:30 +0000 (17:48 +0200)
committerMarko Kreen <markokr@gmail.com>
Wed, 27 Feb 2013 15:48:30 +0000 (17:48 +0200)

Trivial merge