[python-cvxopt/f14: 2/2] Merge branch 'master' into f14

[Jerry James]

commit 298628895e917bf77fc9dfdac1fb7108c0d78791
Merge: 65e2c4e 127afa8
Author: Jerry James <loganjerry at gmail.com>
Date:   Wed Jun 22 10:09:51 2011 -0600

    Merge branch 'master' into f14

 python-cvxopt-setup.patch |   13 +++++++++++--
 python-cvxopt.spec        |   11 +++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)
---