Merge pull request #2612 from grkutty:pullreq/140319-bilateral-b

author Andrey Pavlenko <andrey.pavlenko@itseez.com>

Tue, 22 Apr 2014 05:32:38 +0000 (09:32 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Tue, 22 Apr 2014 05:32:39 +0000 (09:32 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 22 Apr 2014 05:32:38 +0000 (09:32 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Tue, 22 Apr 2014 05:32:39 +0000 (09:32 +0400)
diff --cc modules/imgproc/src/smooth.cpp
Simple merge
diff --cc modules/imgproc/test/ocl/test_filters.cpp
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Tue, 22 Apr 2014 05:32:38 +0000 (09:32 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Tue, 22 Apr 2014 05:32:39 +0000 (09:32 +0400)
		1	2
modules/imgproc/src/smooth.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/imgproc/test/ocl/test_filters.cpp	patch \|	diff1 \|	diff2 \|	blob \| history