Merge remote-tracking branch 'petr/master'
authorMarko Kreen <[email protected]>
Mon, 4 Mar 2013 09:35:06 +0000 (11:35 +0200)
committerMarko Kreen <[email protected]>
Mon, 4 Mar 2013 09:35:06 +0000 (11:35 +0200)

Trivial merge