Merge pull request #1214 from StevenPuttemans:feature_3169_others
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 2 Aug 2013 13:59:05 +0000 (17:59 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 2 Aug 2013 13:59:06 +0000 (17:59 +0400)

Trivial merge