[PyQwt/el6/master: 14/14] Merge branch 'master' into el6

[Tadej Janež]

commit 8f0291b14bbb7c603f4145465dd897e3f842fd6a
Merge: bd0c6ba 33f9d75
Author: Tadej Janež <tadej.janez at tadej.hicsalta.si>
Date:   Fri Jan 14 13:34:40 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	PyQwt.spec

 PyQwt.spec |   63 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 45 insertions(+), 18 deletions(-)
---