Merge remote branch 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Tue, 29 Sep 2009 17:24:26 +0000 (19:24 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 29 Sep 2009 17:24:26 +0000 (19:24 +0200)

Trivial merge