Merge pull request #188 from asmorkalov:app_framework
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 27 Nov 2012 13:50:39 +0000 (17:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 27 Nov 2012 13:50:39 +0000 (17:50 +0400)

Trivial merge