Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Fri, 10 Apr 2009 00:02:20 +0000 (02:02 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 10 Apr 2009 00:02:20 +0000 (02:02 +0200)

Trivial merge