[rubygem-nokogiri/f18: 3/3] Merge remote-tracking branch 'origin/master' into f18

[Mamoru Tasaka]

commit 033ba0485a3aef8aa8a28553e1617bed02e3c498
Merge: 200ab66 a479e06
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Mon Dec 31 17:40:19 2012 +0900

    Merge remote-tracking branch 'origin/master' into f18

 rubygem-nokogiri.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---