Merge commit 'vudentz/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 19 Jan 2009 22:12:23 +0000 (23:12 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 19 Jan 2009 22:12:23 +0000 (23:12 +0100)

Trivial merge