[python-pep8/el5/master: 10/10] Merge branch 'el6' into el5

[Ian Weller]

commit 1ed807e113014b37da170fa10736b9fa232acc45
Merge: 8722c83 4869529
Author: Ian Weller <ian at ianweller.org>
Date:   Fri Jan 21 15:42:39 2011 -0600

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	python-pep8.spec
    	sources

 .gitignore       |    2 +-
 python-pep8.spec |   24 +++++++++++++++++++-----
 sources          |    2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 5266806,c8cf0ec..f70cec7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--pep8-0.4.2.tar.gz
+ jcrocholl-pep8-29968a6.tar.gz