Merge commit 'vudentz/master'
authorLennart Poettering <lennart@poettering.net>
Wed, 4 Feb 2009 17:42:13 +0000 (18:42 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 4 Feb 2009 17:42:13 +0000 (18:42 +0100)

Trivial merge