[deja-dup/f15/master: 2/2] Merge branch 'master' into f15

[Rahul Sundaram]

commit 7e5bbfad706d25b0086f5bee3673bcd261940230
Merge: be13db1 9c6daf6
Author: Rahul <sundaram at fedoraproject.org>
Date:   Sun Mar 27 23:23:23 2011 +0530

    Merge branch 'master' into f15

 .gitignore    |    1 +
 deja-dup.spec |   12 ++++++++----
 sources       |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---