[python-storm/f14: 2/2] Merge branch 'master' into f14

[Michel Alexandre Salim]

commit b4ca2f0312f9c6d4d43534435c9094ed3af2442e
Merge: 18d52d2 da04a41
Author: Michel Alexandre Salim <michel.salim at cs.fau.de>
Date:   Thu Oct 6 17:10:32 2011 +0200

    Merge branch 'master' into f14

 .gitignore        |    2 +-
 python-storm.spec |   20 ++++++++++++--------
 sources           |    2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)
---