[shotwell: 7/7] Merge branch 'f14'

[Siddhesh Poyarekar]

commit 2ec688462c4f60f945de21ea1d1541e7cd5d835b
Merge: 0e0dab7 f2c6146
Author: Siddhesh Poyarekar <siddhesh.poyarekar at gmail.com>
Date:   Sun Jan 2 23:45:07 2011 +0530

    Merge branch 'f14'
    
    Add user_photos to permissions required. Fixes bz #666512.
    
    Conflicts:
    	shotwell.spec

 shotwell-fix-permissions.patch |   13 +++++++++++++
 shotwell.spec                  |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --cc shotwell.spec
index 4f05641,fbc6159..88dad2d
--- a/shotwell.spec
+++ b/shotwell.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           shotwell
  Version:        0.7.2
--Release:        3%{?dist}
++Release:        4%{?dist}
  Summary:        A photo organizer for the GNOME desktop
  
  Group:          Applications/Multimedia
@@@ -89,9 -92,9 +92,12 @@@ gtk-update-icon-cache --quiet %{_datadi
  
  
  %changelog
 -* Sun Jan  2 2011 Siddhesh Poyarekar <siddhesh at redhat.com> - 0.7.2-3
++* Sun Jan  2 2011 Siddhesh Poyarekar <siddhesh at redhat.com> - 0.7.2-4
+ - Add user_photos to permissions required. Fixes bz #666512.
+ 
 +* Sun Jan 02 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.7.2-3
 +- rebuild (exiv2)
 +
  * Wed Sep 29 2010 jkeating - 0.7.2-2
  - Rebuilt for gcc bug 634757