Merge pull request #1021 from alekcac:platforms
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 25 Jun 2013 07:32:51 +0000 (11:32 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 25 Jun 2013 07:32:52 +0000 (11:32 +0400)

Trivial merge