[gthumb: 3/3] Merge remote branch 'origin/f14/master'

[chkr]

commit 43a4c8d124344cc2f8b3f8032f6e5e4857470188
Merge: f9d583c 7658e3a
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Wed Aug 18 22:42:41 2010 +0200

    Merge remote branch 'origin/f14/master'

---