[exiv2/f14/master: 5/5] Merge remote-tracking branch 'origin/f15/master' into f14/master

[Rex Dieter]

commit fe0b317b95e3dec8e5b9ed4a69a7983c2a3036c8
Merge: 7f942bb f77490f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Mar 29 08:07:23 2011 -0500

    Merge remote-tracking branch 'origin/f15/master' into f14/master
    
    Conflicts:
    	exiv2.spec

 .gitignore              |    2 +-
 bug752-exiv2-0.20.patch |  171 -----------------------------------------------
 exiv2-0.20-deps.patch   |   37 ----------
 exiv2.spec              |   33 ++++-----
 sources                 |    2 +-
 5 files changed, 17 insertions(+), 228 deletions(-)
---