[python-virtualenv/f12/master: 11/11] Merge branch 'master' into f12

[smilner]

commit aded17cf5fa4c14c94063bac046179d8084a6870
Merge: 21f6b9a 7c040f7
Author: Steve 'Ashcrow' Milner <stevem at gnulinux.net>
Date:   Sat Oct 16 11:31:24 2010 -0400

    Merge branch 'master' into f12

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