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

[Vít Ondruch]

commit 2dc003086a441d3c8a2f1cce99e285f808dcfbd3
Merge: 26ddd0e e6e8086
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Feb 29 14:22:32 2012 +0100

    Merge branch 'master' into f17

 fam-ruby-1.9.patch |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ruby-fam.spec      |   14 +++++++----
 2 files changed, 73 insertions(+), 5 deletions(-)
---