Merge pull request #1063 from alekcac:conversion
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 28 Jun 2013 10:41:35 +0000 (14:41 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Fri, 28 Jun 2013 10:41:35 +0000 (14:41 +0400)

Trivial merge