[python-gdata/f13/master: 21/21] Merge branch 'master' into f13

[Adam Goode]

commit 82def338fff4262f3fbdcfeebb2a526b4f891e6b
Merge: 8f40e33 eb95564
Author: Adam Goode <adam at spicenitz.org>
Date:   Sat Jul 31 12:55:03 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	python-gdata.spec
    	sources

 .gitignore        |    2 +-
 python-gdata.spec |   52 ++++++++++++++++++++++++++++++++++++----------------
 sources           |    2 +-
 3 files changed, 38 insertions(+), 18 deletions(-)
---