[rubygem-nokogiri/f17] (12 commits) ...A Happy New Year

[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 (*)
  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 (*)
  61b5ec3... Merge remote-tracking branch 'origin/f17' (*)
  f7f82ee... fix merge conflict (*)
  0ad636e... A Happy New Year (*)

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