Merge pull request #956 from IanVS:COLOR_CODE
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 6 Jun 2013 08:09:41 +0000 (12:09 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 6 Jun 2013 08:09:41 +0000 (12:09 +0400)

Trivial merge