Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Fri, 20 Feb 2009 02:24:27 +0000 (03:24 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 20 Feb 2009 02:24:27 +0000 (03:24 +0100)

Trivial merge