Merge pull request #1300 from kdrobnyh:FilterBilateral
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 2 Sep 2013 13:01:38 +0000 (17:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 2 Sep 2013 13:01:38 +0000 (17:01 +0400)

Trivial merge