[python-IPy/el5: 15/15] Merge branch 'master' into el5

[Matt Domsch]

commit 663ae016b4501ba4c78cbffb608c5efd8174c698
Merge: 069b5d2 eb3caf9
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Mon Jul 4 11:52:53 2011 -0500

    Merge branch 'master' into el5

 .gitignore      |    1 +
 python-IPy.spec |   27 ++++++++++++++++++++++++++-
 sources         |    2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)
---