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

Trivial merge