[libkexiv2/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 07528078b834773770c45211cf0de3d25085d8fe
Merge: 7417a70 ee1524f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 19:10:56 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	libkexiv2.spec
    	sources

 .gitignore     |    3 +--
 libkexiv2.spec |   30 ++++++++++++++++++++++++++----
 sources        |    2 +-
 3 files changed, 28 insertions(+), 7 deletions(-)
---