Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Wed, 28 Jan 2009 03:25:07 +0000 (04:25 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 28 Jan 2009 03:25:07 +0000 (04:25 +0100)

Trivial merge