Merge commit 'vudentz/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 6 Oct 2008 00:28:17 +0000 (02:28 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 6 Oct 2008 00:28:17 +0000 (02:28 +0200)

Trivial merge