Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Sun, 7 Jun 2009 22:27:52 +0000 (00:27 +0200)
committerLennart Poettering <lennart@poettering.net>
Sun, 7 Jun 2009 22:27:52 +0000 (00:27 +0200)

Trivial merge