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

[smilner]

commit 8756099c8660d11f79dd2fd81b22dd59a770a081
Merge: 59423b5 2abcf6e
Author: Steve Milner <stevem at gnulinux.net>
Date:   Tue Aug 14 13:04:30 2012 -0400

    Merge branch 'master' into el5

 .gitignore             |    1 +
 python-virtualenv.spec |   16 +++++++++++-----
 sources                |    3 +--
 3 files changed, 13 insertions(+), 7 deletions(-)
---