[rubygem-poppler/f17: 8/8] Merge remote-tracking branch 'origin/master' into f17

[Mamoru Tasaka]

commit eb57cf7114398b692ed8fdcb3bb07c3b45a75dd1
Merge: 3123fbb 4068776
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Thu Dec 6 17:54:09 2012 +0900

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

 .gitignore           |    1 +
 rubygem-poppler.spec |    5 ++++-
 sources              |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---