Merge remote branch 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Sat, 19 Sep 2009 00:35:13 +0000 (02:35 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 19 Sep 2009 00:35:13 +0000 (02:35 +0200)

Trivial merge