Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Fri, 21 Aug 2009 22:08:33 +0000 (00:08 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 21 Aug 2009 22:08:33 +0000 (00:08 +0200)

Trivial merge