Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Mon, 23 Mar 2009 15:32:03 +0000 (16:32 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 23 Mar 2009 15:32:03 +0000 (16:32 +0100)

Trivial merge