Merge commit 'flameeyes/buildfixes-2'
authorLennart Poettering <lennart@poettering.net>
Mon, 19 Jan 2009 23:55:36 +0000 (00:55 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 19 Jan 2009 23:55:36 +0000 (00:55 +0100)

Trivial merge