Merge commit '12db687acf3befe485bfff3700111999c95247fa'
authorLennart Poettering <lennart@poettering.net>
Wed, 28 Jan 2009 03:22:51 +0000 (04:22 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 28 Jan 2009 03:22:51 +0000 (04:22 +0100)

Trivial merge