Merge 'master'
authorLove Hornquist Astrand <lha@h5l.org>
Wed, 25 Nov 2009 01:32:26 +0000 (02:32 +0100)
committerLove Hornquist Astrand <lha@h5l.org>
Wed, 25 Nov 2009 01:32:26 +0000 (02:32 +0100)

Trivial merge