Merge branch '2.4'

modules/python/src2/cv.py

@@ -1,3 +1 @@
-#/usr/bin/env python
-
 from cv2.cv import *

modules/python/src2/cv2.cpp

@@ -396,7 +396,7 @@ static PyObject* pyopencv_from(const Mat& m)
     if(!p->refcount || p->allocator != &g_numpyAllocator)
     {
         temp.allocator = &g_numpyAllocator;
-        m.copyTo(temp);
+        ERRWRAP2(m.copyTo(temp));
         p = &temp;
     }
     p->addref();

modules/python/src2/gen.py

@@ -1,4 +1,4 @@
-#/usr/bin/env python
+#!/usr/bin/env python
 
 import sys
 from string import Template

modules/python/src2/gen2.py

@@ -1,4 +1,4 @@
-#/usr/bin/env python
+#!/usr/bin/env python
 
 import hdr_parser, sys, re, os, cStringIO
 from string import Template

modules/python/src2/hdr_parser.py

@@ -1,4 +1,4 @@
-#/usr/bin/env python
+#!/usr/bin/env python
 
 import os, sys, re, string