Merge remote branch 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Thu, 10 Sep 2009 23:24:36 +0000 (01:24 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 10 Sep 2009 23:24:36 +0000 (01:24 +0200)

Trivial merge