[python-gdata/el5/master: 29/30] Merge branch 'el6' into el5

[Adam Goode]

commit e307ba807d149447c909fbcca90d721da134b505
Merge: 54e489e 2751c8a
Author: Adam Goode <adam at spicenitz.org>
Date:   Sat Jul 31 22:46:46 2010 -0400

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore

 .gitignore        |    2 +-
 python-gdata.spec |   47 ++++++++++++++++++++++++++++++++---------------
 sources           |    2 +-
 3 files changed, 34 insertions(+), 17 deletions(-)
---