[f-spot: 3/3] Merge branch 'FSPOT_0_6_0_STABLE'

[Stephane Delcroix <sdelcroix src gnome org>]

commit 2a7fb78e423bc52c0b7a496977935a6f37929cca
Merge: fa25ad6... 2b66dc1...
Author: Stephane Delcroix <stephane delcroix org>
Date:   Mon Aug 31 11:15:34 2009 +0200

    Merge branch 'FSPOT_0_6_0_STABLE'

 extensions/Tools/HashJob/HashJob.cs |    6 +-
 po/POTFILES.in                      |    1 +
 po/ca.po                            | 1123 ++++++++++++++++++++---------------
 3 files changed, 662 insertions(+), 468 deletions(-)
---