Merge commit '38ded3bb31bc49664641965f856a35f432a8a956'
authorLennart Poettering <lennart@poettering.net>
Thu, 19 Feb 2009 04:17:08 +0000 (05:17 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 19 Feb 2009 04:17:08 +0000 (05:17 +0100)

Trivial merge