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

[Ben Boeckel]

commit ae7697fd069e65192a0b46aa3fd99e4b4277be3c
Merge: d1294c3 003d0c4
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Fri Aug 20 23:28:55 2010 -0400

    Merge branch 'master' into f12

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