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

Trivial merge