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

[Ben Boeckel]

commit 4858c58bb7d13d86745e9e7b7eb1fd1980049233
Merge: baa725b 003d0c4
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Fri Aug 20 23:28:51 2010 -0400

    Merge branch 'master' into f13

 uzbl.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---