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

[smilner]

commit 8af1ff0c7a7f01a164a88485e96e0119d825bd43
Merge: c998700 02c7502
Author: Steve Milner <smilner at redhat.com>
Date:   Thu Aug 15 12:00:18 2013 -0400

    Merge branch 'master' into el6

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