Merge branch 'master' of git://5.9.49.245/opencv
authorKirill Kornyakov <kirill.kornyakov@itseez.com>
Tue, 9 Oct 2012 14:57:02 +0000 (18:57 +0400)
committerKirill Kornyakov <kirill.kornyakov@itseez.com>
Tue, 9 Oct 2012 14:57:02 +0000 (18:57 +0400)

Trivial merge