[deja-dup/f15/master: 7/7] Merge branch 'master' into f15, update to deja-dup 17.90.

[csmart]

commit 341a8f49bab2a2ba951172bd387fad49b624feed
Merge: e59d81e cec81c8
Author: Christopher Smart <csmart at fedoraproject.org>
Date:   Sat Mar 5 21:08:01 2011 +1100

    Merge branch 'master' into f15, update to deja-dup 17.90.
    
    Conflicts:
    	.gitignore
    	deja-dup.spec
    	sources

 .gitignore    |    1 +
 deja-dup.spec |   20 +++++++++++++++-----
 sources       |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
---
diff --cc deja-dup.spec
index 5525832,3a7fa8b..554a88a
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@@ -91,9 -90,16 +91,19 @@@ glib-compile-schemas %{_datadir}/glib-2
  %{_datadir}/icons/hicolor/scalable/apps/deja-dup-symbolic.svg
  
  %changelog
+ * Tue Mar 05 2011 Chris Smart <csmart at fedoraproject.org> - 17.90-1
+ - Update to latest upstream release
+ - http://bazaar.launchpad.net/~deja-dup-team/deja-dup/trunk/revision/838
+ 
 +* Fri Feb 11 2011 Matthias Clasen <mclasen at redhat.com> - 17.6-2
 +- Rebuild against newer gtk
 +
+ * Tue Feb 15 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 17.6-3
+ - Rebuild against new GTK
+ 
+ * Fri Feb 11 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 17.6-2
+ - Update build requirements
+ 
  * Fri Feb 11 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 17.6-1
  - Update to latest upstream release
  - http://bazaar.launchpad.net/~deja-dup-team/deja-dup/trunk/revision/827