[hyperestraier/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit 8276bbfda23de496bfce33b15e9f8e74db6d8ea7
Merge: f8ee82b 69f86e3
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Thu Mar 1 15:11:11 2012 +0100

    Merge branch 'master' into f17

 huperestraier-1.4.13-ruby-19-compat.patch |   76 +++++++++++++++++++++++++++++
 hyperestraier.spec                        |   26 +++++++---
 2 files changed, 95 insertions(+), 7 deletions(-)
---