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

[Michel Alexandre Salim]

commit 711abca2e554db6d21d85bfe12ed018c71a9c439
Merge: f8dcc0a 34daacd
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Sep 17 16:13:18 2010 +0200

    Merge branch 'master' into f13

 .gitignore                       |    2 +-
 python-storm.spec                |   21 +++++++++++++++------
 sources                          |    2 +-
 storm-fix-non-ordered-test.patch |   14 ++++++++++++++
 4 files changed, 31 insertions(+), 8 deletions(-)
---