Merge pull request #312 from taka-no-me:cheatsheet
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Sat, 19 Jan 2013 08:03:20 +0000 (12:03 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sat, 19 Jan 2013 08:03:20 +0000 (12:03 +0400)

Trivial merge