[ruby-RRDtool/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit 6b79802cc7866bf2069083bb55b9dd5ee7b5c780
Merge: cff46c7 22763b4
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Feb 29 13:49:37 2012 +0100

    Merge branch 'master' into f17

 ruby-RRDtool.spec                       |   17 ++--
 ruby-rrdtool-patch-for-ruby-1.9.3.patch |  137 +++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+), 7 deletions(-)
---