[python-storm/f13/master: 4/4] Merge branch 'master' into f13

[Michel Alexandre Salim]

commit 2395f38ffa3062a629cc2192401405ff78a0bec0
Merge: 711abca 523726f
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Mar 13 17:33:08 2011 +0100

    Merge branch 'master' into f13

 .gitignore        |    2 +-
 python-storm.spec |   11 ++++++++++-
 sources           |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---