Merge commit 'origin/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 30 Mar 2009 17:14:09 +0000 (19:14 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 30 Mar 2009 17:14:09 +0000 (19:14 +0200)

Trivial merge