[shotwell/f14/master: 6/6] Merge branch 'master' into f14

[Michel Alexandre Salim]

commit 350a0fae27bae6eb1ac2a919d9d4f656f9c15571
Merge: b4da250 36ce195
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Nov 14 00:42:46 2010 +0100

    Merge branch 'master' into f14

 shotwell.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---