[python-IPy/el6: 7/7] Merge branch 'master' into el6

[Matt Domsch]

commit 4ff2e8b8d4c6655b24a67093dfb4be7dcfe18310
Merge: 7f5b290 eb3caf9
Author: Matt Domsch <Matt_Domsch at dell.com>
Date:   Tue Jun 21 12:32:00 2011 -0500

    Merge branch 'master' into el6

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