[rubygem-nokogiri/f16] (22 commits) ...fix merge conflict

[Mamoru Tasaka]

Summary of changes:

  71613a1... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  53c144c... 1.5.0 (*)
  8829b10... F-17: rebuild for ruby19 (*)
  adc6458... F-17: rebuild for ruby19 For now aviod build failure by tou (*)
  481cf01... Fix conditionals for F17 to work for RHEL 7 as well. (*)
  1654140... Merge branch 'master' into f17 (*)
  dfc11c7... 1.5.2 (*)
  b0329e1... 1.5.2 (*)
  6b664d7... Fix Obsoletes (bug 822931) (*)
  b03de4d... Fix Obsoletes (bug 822931) (*)
  5d3e757... anyway build for now (*)
  4ebcfd6... 1.5.5 (*)
  cc9122d... 1.5.5 (*)
  a929449... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  9fcb90e... Rebuilt againts libxml2 2.9. (*)
  200ab66... Merge branch 'master' into f18 (*)
  d00e968... add ruby_sitelib again (*)
  a479e06... once clean up macro (*)
  033ba04... Merge remote-tracking branch 'origin/master' into f18 (*)
  592f2ca... fix merge conflict (*)
  61b5ec3... Merge remote-tracking branch 'origin/f17' (*)
  f7f82ee... fix merge conflict

(*) This commit already existed in another branch; no separate mail sent