Merge commit 'flameeyes/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 10 Aug 2009 19:33:42 +0000 (21:33 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 10 Aug 2009 19:33:42 +0000 (21:33 +0200)

Trivial merge