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

[smilner]

commit 59423b5da1611807c1d1d7724bc8e6f2d565ba8a
Merge: 6638d6f c021ce4
Author: Steve 'Ashcrow' Milner <smilner at redhat.com>
Date:   Wed Mar 14 14:50:02 2012 -0400

    Merge branch 'master' into el5

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