[gnome-packagekit: 6/6] Merge commit 'e8c940d5662b4c97668c9dfefbe585ab0f8ffd90'

[Adam Williamson]

commit 1a1e9b80b4f7fd5cbea60eb3c7ddab29a307c8fd
Merge: 4571886 e8c940d
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Nov 9 17:28:45 2011 -0800

    Merge commit 'e8c940d5662b4c97668c9dfefbe585ab0f8ffd90'
    
    Conflicts:
    	.gitignore
    	gnome-packagekit.spec
    	sources

 .gitignore                                   |    2 +
 0001-Fix-compile-for-PackageKit-0.6.11.patch |   27 --------------------------
 gnome-packagekit.spec                        |   10 ++++++++-
 sources                                      |    3 +-
 4 files changed, 13 insertions(+), 29 deletions(-)
---
diff --cc .gitignore
index 12f3e09,c2211d0..952899c
--- a/.gitignore
+++ b/.gitignore
@@@ -13,3 -13,4 +13,5 @@@ gnome-packagekit-2.31.4.tar.g
  /gnome-packagekit-3.1.90.tar.xz
  /gnome-packagekit-3.1.92.tar.xz
  /gnome-packagekit-3.2.0.tar.xz
+ /gnome-packagekit-3.2.1.tar.xz
++
diff --cc sources
index 04aae48,f92a039..c85b794
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
- fdf4404e8f45eab05b6320ace68e2c16  gnome-packagekit-3.2.0.tar.xz
+ 2c4f10fd62f3b18041bc7f633132f86d  gnome-packagekit-3.2.1.tar.xz
++