Merge remote branch 'remotes/uzbl/master'
authorDieter Plaetinck <dieter@plaetinck.be>
Wed, 2 Sep 2009 08:52:03 +0000 (10:52 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Wed, 2 Sep 2009 08:52:03 +0000 (10:52 +0200)

Trivial merge