Merge remote-tracking branch 'origin/2.4' into merge-2.4

author Roman Donchenko <roman.donchenko@itseez.com>

Mon, 28 Apr 2014 08:08:21 +0000 (12:08 +0400)

committer Roman Donchenko <roman.donchenko@itseez.com>

Mon, 28 Apr 2014 08:08:21 +0000 (12:08 +0400)
author Roman Donchenko <roman.donchenko@itseez.com>
Mon, 28 Apr 2014 08:08:21 +0000 (12:08 +0400)
committer Roman Donchenko <roman.donchenko@itseez.com>
Mon, 28 Apr 2014 08:08:21 +0000 (12:08 +0400)
diff --cc modules/highgui/doc/reading_and_writing_images_and_video.rst
Simple merge
author	Roman Donchenko <roman.donchenko@itseez.com>
	Mon, 28 Apr 2014 08:08:21 +0000 (12:08 +0400)
committer	Roman Donchenko <roman.donchenko@itseez.com>
	Mon, 28 Apr 2014 08:08:21 +0000 (12:08 +0400)