[rubygem-nokogiri/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit 165414080fe7a4e9ffcba123b1ddd1575ded2014
Merge: adc6458 481cf01
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Apr 3 09:47:02 2012 +0200

    Merge branch 'master' into f17

 rubygem-nokogiri-1.5.0.beta3-test-failure.patch |   11 -----------
 rubygem-nokogiri.spec                           |   19 ++++++++++++-------
 2 files changed, 12 insertions(+), 18 deletions(-)
---