[gphotoframe/f16: 12/12] Merge remote-tracking branch 'origin/f17' into f16

[Mamoru Tasaka]

commit f676d57e1683b528b7576fd2eccddd25779ad80d
Merge: ad8bca7 2bde7e0
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Tue Dec 18 17:58:38 2012 +0900

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

 gphotoframe-1.5.1-parseexif-fraction-zerodiv.patch |   14 ++++++++++++++
 gphotoframe.spec                                   |   12 +++++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---