Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Wed, 3 Sep 2008 21:13:26 +0000 (23:13 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 3 Sep 2008 21:13:26 +0000 (23:13 +0200)

Trivial merge