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

[Ben Boeckel]

commit baa725b5032a56fdd2e25b929d826cef24491cfa
Merge: fdc7601 40b0d8e
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Fri Aug 6 18:42:24 2010 -0400

    Merge branch 'master' into f13
    
    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(-)
---