Merge remote-tracking branch 'petr/master'
authorMarko Kreen <markokr@gmail.com>
Wed, 20 Feb 2013 18:36:27 +0000 (20:36 +0200)
committerMarko Kreen <markokr@gmail.com>
Wed, 20 Feb 2013 18:36:27 +0000 (20:36 +0200)

Trivial merge