[libkexiv2/f17: 2/2] Merge branch 'f18' into f17

[Than Ngo]

commit 9268ff4009d08779270ce845f038bf35fb99b9b2
Merge: 1aa9457 4e03bc6
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:44:22 2012 +0100

    Merge branch 'f18' into f17

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