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

[Fabian Affolter]

commit 066d6947a3a88d745a5007156f29bb2841f7e739
Merge: 7aa941e e73bdb3
Author: Fabian Affolter <fabian at bernewireless.net>
Date:   Sat Jun 4 11:36:40 2011 +0200

    Merge branch 'master' into f14

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