[python-virtualenv/el6: 4/4] Merge branch 'master' into el6

[smilner]

commit 9aa7f1ed61e6966bc58d997422ccfb49cb5eebaa
Merge: 0895a0e 6dd9f54
Author: Steve 'Ashcrow' Milner <stevem at gnulinux.net>
Date:   Tue Dec 20 12:23:43 2011 -0500

    Merge branch 'master' into el6

 .gitignore             |    1 +
 python-virtualenv.spec |   25 +++++++++++++++++++++----
 sources                |    2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)
---