upgraded to FLANN 1.6. Added miniflann interface, which is now used in the rest of OpenCV. Added Python bindings for FLANN.

samples/cpp/fback.cpp

@@ -10,7 +10,7 @@ using namespace std;
 void help()
 {
 	cout <<
-			"\nThis program demonstrates dense, Farnback, optical flow\n"
+			"\nThis program demonstrates dense optical flow algorithm by Gunnar Farneback\n"
 			"Mainly the function: calcOpticalFlowFarneback()\n"
 			"Call:\n"
 			"./fback\n"

samples/cpp/image.cpp

@@ -3,7 +3,7 @@
 #include "ml.h"
 #include <stdio.h>
 #include <iostream>
-#include "opencv2/flann/flann.hpp"
+#include "opencv2/flann/miniflann.hpp"
 
 using namespace cv; // all the new API is put into "cv" namespace. Export its content
 using namespace std;