[uzbl/f12/master: 13/13] Merge branch 'master' into f12

[Ben Boeckel]

commit d1294c31e32acfcde2e8bdd6d491806b22ffcb93
Merge: ea8a73b 40b0d8e
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Fri Aug 6 18:43:48 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	uzbl.spec

 ...shell-interpret-SELECTED_URI-fixes-FS-240.patch |   25 ++++++++++++++++++++
 uzbl.patch => uzbl-makefile.patch                  |    0
 uzbl.spec                                          |   13 ++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)
---