[gvfs/f16: 6/6] Merge remote-tracking branch 'origin/master' into f16

[Tomas Bzatek]

commit a292fcc6007765800cf9d7cf11245220e031f6d1
Merge: bdf6664 d652e95
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Mon Oct 17 15:25:10 2011 +0200

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	.gitignore
    	gvfs.spec
    	sources

 .gitignore |    1 +
 gvfs.spec  |    8 ++++----
 sources    |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --cc gvfs.spec
index facd834,10b9ba6..2347b1b
--- a/gvfs.spec
+++ b/gvfs.spec
@@@ -315,10 -315,10 +315,10 @@@ killall -USR1 gvfsd >&/dev/null || 
  %{_datadir}/gvfs/mounts/afp-browse.mount
  
  %changelog
- * Mon Sep 26 2011 Ray <rstrode at redhat.com> - 1.10.0-1
- - Update to 1.10.0
+ * Mon Oct 17 2011 Tomas Bzatek <tbzatek at redhat.com> - 1.10.1-1
+ - Update to 1.10.1
  
 -* Tue Sep 27 2011 Ray <rstrode at redhat.com> - 1.10.0-1
 +* Mon Sep 26 2011 Ray <rstrode at redhat.com> - 1.10.0-1
  - Update to 1.10.0
  
  * Mon Sep  5 2011 Matthias Clasen <mclasen at redhat.com> - 1.9.5-1