Merge commit 'flameeyes/osx'
authorLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2009 13:13:29 +0000 (15:13 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2009 13:13:29 +0000 (15:13 +0200)

Trivial merge