[python-storm/el6/master: 11/11] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit 23884890aa1b07863123216d16c6fa4aa7ccf40c
Merge: 1fc04da 523726f
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Mar 13 19:06:58 2011 +0100

    Merge branch 'master' into el6

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