Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Tue, 31 Mar 2009 18:28:58 +0000 (20:28 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 31 Mar 2009 18:28:58 +0000 (20:28 +0200)

Trivial merge