Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Mon, 24 Aug 2009 01:31:03 +0000 (03:31 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 24 Aug 2009 01:31:03 +0000 (03:31 +0200)

Trivial merge