[rubygem-nokogiri] (6 commits) ...fix merge conflict

[Mamoru Tasaka]

Summary of changes:

  f462b6a... 1.5.0 (*)
  3802e6e... 1.5.2 (*)
  221a0ad... Fix Obsoletes (bug 822931) (*)
  cdb3a25... 1.5.5 (*)
  e0df5ed... add ruby_sitelib again (*)
  f7f82ee... fix merge conflict (*)

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