[python-mygpoclient/f13/master: 7/7] Merge branch 'master' into f13

[Ville-Pekka Vainio]

commit 0b86f6262e57b205d1de42eee133984e937dfc7a
Merge: 537b9cd 6838851
Author: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
Date:   Tue Oct 12 20:00:04 2010 +0300

    Merge branch 'master' into f13

 .gitignore              |    3 ++-
 python-mygpoclient.spec |    8 +++++++-
 sources                 |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---