[nautilus: 12/12] Merge branch 'f15'

[Tomas Bzatek]

commit 6a5a69e061e45577b601bc97ad4c18f1158ea362
Merge: 8419fb0 3ee4359
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Fri Apr 22 14:09:11 2011 +0200

    Merge branch 'f15'
    
    Conflicts:
    	.gitignore
    	nautilus.spec
    	sources

 .gitignore               |   22 ++++++----------------
 nautilus-578086-po.patch |   24 ------------------------
 nautilus.spec            |   38 +++++++++++++++++++++++++++++---------
 sources                  |    2 +-
 4 files changed, 36 insertions(+), 50 deletions(-)
---
diff --cc .gitignore
index e1c7be5,97971ff..17cd5be
--- a/.gitignore
+++ b/.gitignore
@@@ -1,16 -1,22 +1,6 @@@
--nautilus-2.31.5.tar.bz2
--nautilus-2.31.6.tar.bz2
--/nautilus-2.31.90.tar.bz2
--/nautilus-2.90.1.tar.bz2
--/nautilus-2.90.1-gitf3bbee7.tar.gz
--/nautilus-2.91.0.tar.bz2
--/nautilus-2.91.0.1.tar.bz2
--/nautilus-2.91.1.tar.bz2
--/nautilus-2.91.2.tar.bz2
--/nautilus-2.91.3.tar.gz
--/nautilus-2.91.3.tar.bz2
--/nautilus-2.91.6.tar.bz2
--/nautilus-2.91.7.tar.bz2
--/nautilus-2.91.8.tar.bz2
--/nautilus-2.91.9.tar.bz2
--/nautilus-2.91.90.tar.bz2
+ /nautilus-2.91.90.1.tar.bz2
+ /nautilus-2.91.91.tar.bz2
+ /nautilus-2.91.92.tar.bz2
+ /nautilus-2.91.93.tar.bz2
+ /nautilus-2.91.94.tar.bz2
+ /nautilus-3.0.0.tar.bz2