[rapid-photo-downloader/f17: 3/3] Merge branch 'master' into f17

[Fabian Affolter]

commit 975be66d9ef3738f89fa095ba4f4a407d494a50c
Merge: 7d52207 5b210a3
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Mon Jun 25 21:24:36 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	rapid-photo-downloader.spec

 .gitignore                  |    1 +
 rapid-photo-downloader.spec |    5 ++++-
 sources                     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---