[gthumb/f14/master: 2/2] Merge branch 'master' into f14

[chkr]

commit 4a59a9c1dc2d11a1611d6ccd68a62223ffffd7d4
Merge: a3a4adb 5a30ffe
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Tue Aug 31 22:41:27 2010 +0200

    Merge branch 'master' into f14

 .gitignore  |    1 +
 gthumb.spec |    8 ++++++--
 sources     |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---