Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Mon, 13 Apr 2009 21:07:27 +0000 (23:07 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 13 Apr 2009 21:07:27 +0000 (23:07 +0200)

Trivial merge