[uzbl/f14/master: 19/19] Merge branch 'master' into f14

[Ben Boeckel]

commit c3507f46e180313fce63f0193ba0be3ddd87d25c
Merge: b461561 0ed7248
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Tue Apr 12 15:27:22 2011 -0400

    Merge branch 'master' into f14
    
    * master:
      Don't install removed uzbl-cookie-manager.
      Update uzbl-makefile.patch not to remove non-existent files.
      Update to 0-0.25.20110402gite7578e27c.
      Update to 0-0.24.20110215git8bbc39b83.
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
      - Update the vim subpackage to install for 7.3
      Update to 0-0.21.20101125git518004933.
      Update to 0-0.20.20101125git518004933.
      Remove references to local patches
      Fix CFLAGS exporting
      Missing BR on pkg-config
      Link glib-2.0 as well
      Bump release
      Add a message for new users without uzbl-defaults
      Split out -defaults package
      Ship vim highlighting files
      Use %{optflags} instead of -O0
      Update to -0.18.
    
    Conflicts:
    	.gitignore
    	uzbl.spec

 .gitignore                                         |    4 +-
 ...shell-interpret-SELECTED_URI-fixes-FS-240.patch |   25 ----
 ...ora-specific-error-messages-on-no-configs.patch |   37 ++++++
 sources                                            |    2 +-
 uzbl-makefile.patch                                |   36 ++-----
 uzbl.spec                                          |  117 ++++++++++++++-----
 6 files changed, 136 insertions(+), 85 deletions(-)
---
diff --cc .gitignore
index ed164c3,ef84970..2019a54
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,5 +1,4 @@@
--uzbl-afc0f873e.tar.gz
  /uzbl-afc0f873e.tar.gz
+ /uzbl-518004933.tar.gz
+ /uzbl-8bbc39b83.tar.gz
+ /uzbl-e7578e27c.tar.gz