Merge branch 'master' into lennartsbtfixes
authorLennart Poettering <lennart@poettering.net>
Thu, 29 Jan 2009 23:31:03 +0000 (00:31 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 29 Jan 2009 23:31:03 +0000 (00:31 +0100)

Trivial merge