[PyYAML: 22/29] Merge branch 'master' into el4

[John Eckersberg]

commit 5c88dc5da3319f2d5c81f6a49862a0834a68fda9
Merge: 1d4e21c bd42003
Author: John Eckersberg <jeckersb at redhat.com>
Date:   Wed Feb 2 10:08:42 2011 -0500

    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore
    	PyYAML.spec
    	sources

 .gitignore  |    2 +-
 PyYAML.spec |   47 +++++++++++++++++++++++++++++++++--------------
 sources     |    2 +-
 3 files changed, 35 insertions(+), 16 deletions(-)
---