merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811

samples/python2/edge.py

@@ -1,8 +1,21 @@
+'''
+This sample demonstrates Canny edge detection.
+
+Usage:
+  edge.py [<video source>]
+
+  Trackbars control edge thresholds.
+
+'''
+
 import cv2
 import video
 import sys
 
+
 if __name__ == '__main__':
+    print __doc__
+    
     try: fn = sys.argv[1]
     except: fn = 0