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

[Michel Alexandre Salim]

commit 99ad94708c1a059c56e85224a9f9e892fc1a4f56
Merge: 2388489 da04a41
Author: Michel Alexandre Salim <michel.salim at cs.fau.de>
Date:   Thu Oct 6 17:24:37 2011 +0200

    Merge branch 'master' into el6

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