[exiv2/f14: 3/3] Merge branch 'master' into f14

[Rex Dieter]

commit 67ad647cab7c94919fe88c4d76fe44f3c6ca02a1
Merge: fe0b317 0076c9a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 27 08:21:37 2011 -0500

    Merge branch 'master' into f14

 exiv2-0.21-Tamron70-300.patch    |   18 ++++++++++++++++++
 exiv2-0.21.1-tiffcomposite.patch |   26 ++++++++++++++++++++++++++
 exiv2.spec                       |   19 ++++++++++++++++++-
 3 files changed, 62 insertions(+), 1 deletions(-)
---