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

[smilner]

commit 6638d6f85d4f08930693c870c3834b7810ccd927
Merge: e076502 6dd9f54
Author: Steve 'Ashcrow' Milner <stevem at gnulinux.net>
Date:   Tue Dec 20 12:29:28 2011 -0500

    Merge branch 'master' into el5

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