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

[smilner]

commit 103f2433e41732ba1faac6a60389aca60dc37471
Merge: 9aa7f1e c021ce4
Author: Steve 'Ashcrow' Milner <smilner at redhat.com>
Date:   Wed Mar 14 14:40:31 2012 -0400

    Merge branch 'master' into el6

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