[rapid-photo-downloader/f14/master: 9/9] Merge branch 'master' into f14

[Fabian Affolter]

commit 7aa941e8de281d61529a1cdb1a8e8366951ddff1
Merge: 99838bc 3259c42
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Sat Apr 30 18:37:22 2011 +0200

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

 .gitignore                  |    6 ++++++
 rapid-photo-downloader.spec |   17 +++++++++++++++--
 sources                     |    2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)
---
diff --cc rapid-photo-downloader.spec
index f3725ae,95951fb..8f09e24
--- a/rapid-photo-downloader.spec
+++ b/rapid-photo-downloader.spec
@@@ -84,6 -84,6 +84,7 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{python_sitelib}/*.egg-info
  %{_datadir}/applications/%{name}.desktop
  %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
++%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
  %{_datadir}/pixmaps/%{name}.png
  %{_datadir}/pixmaps/%{name}.xpm