Merge pull request #2999 from jpuigcerver:traincascade_choose_threads
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 25 Jul 2014 13:24:47 +0000 (13:24 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 25 Jul 2014 13:24:47 +0000 (13:24 +0000)

Trivial merge