Itseez/opencv — pull request #1096 by SpecLad (2013-07-08 14:49:07+00:00)
Title: Merge 2.4 into master

Original pull requests:

* #1073 from asmorkalov:android_cvjavaframe
* #1074 from devernay:2.4-cap_qt-multithread
* #1085 from bitwangyaoyao:2.4_optBP
* #1086 from melody-rain:2.4_fix_oclMat_constructor
* #1087 from znah:2.4
* #1090 from asmorkalov:android_tbb_downgrade
* #1091 from SpecLad:xls-updates
* #1092 from asmorkalov:manager_version_inc
* #1094 from asmorkalov:android_na_fix