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

[Dan Horák]

commit 553868449b230543c8462e9a515eca15c5c4053e
Merge: 81297d2 8262bf0
Author: Dan Horak <dan at danny.cz>
Date:   Tue Aug 3 16:28:10 2010 +0200

    Merge branch 'master' into f13

 python-openhpi-fumirollback.patch |   12 ++++++++++++
 python-openhpi.spec               |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---