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

[Adam Goode]

commit 420234e4c6c9d8ce542c47ab4fc6f0c3d1b2787b
Merge: 5996622 82def33
Author: Adam Goode <adam at spicenitz.org>
Date:   Sat Jul 31 12:57:07 2010 -0400

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

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