[opencv/f20: 6/6] Merge branch 'master' into f20

[Rex Dieter]

commit b3fd39f913e0a6a117b7e21c7eb137eebff8945b
Merge: e75baaf d852d96
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu May 1 07:55:24 2014 -0500

    Merge branch 'master' into f20
    
    Conflicts:
    	opencv.spec

 opencv-pkgcmake2.patch |   16 ------------
 opencv.spec            |   63 ++++++++++++++++++++++++-----------------------
 2 files changed, 32 insertions(+), 47 deletions(-)
---