Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Tue, 3 Feb 2009 02:15:32 +0000 (03:15 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 3 Feb 2009 02:15:32 +0000 (03:15 +0100)

Trivial merge