Merge pull request #1348 from SpecLad:merge-2.4

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

Wed, 28 Aug 2013 09:41:39 +0000 (13:41 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Wed, 28 Aug 2013 09:41:41 +0000 (13:41 +0400)
author Roman Donchenko <roman.donchenko@itseez.com>
Wed, 28 Aug 2013 09:41:39 +0000 (13:41 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Wed, 28 Aug 2013 09:41:41 +0000 (13:41 +0400)
diff --cc modules/imgproc/src/connectedcomponents.cpp
Simple merge
diff --cc modules/ml/src/ertrees.cpp
Simple merge
author	Roman Donchenko <roman.donchenko@itseez.com>
	Wed, 28 Aug 2013 09:41:39 +0000 (13:41 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Wed, 28 Aug 2013 09:41:41 +0000 (13:41 +0400)
		1	2
modules/imgproc/src/connectedcomponents.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/ml/src/ertrees.cpp	patch \|	diff1 \|	diff2 \|	blob \| history