Merge branch 'master' into master-tx
authorLennart Poettering <lennart@poettering.net>
Mon, 27 Jul 2009 23:35:19 +0000 (01:35 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 27 Jul 2009 23:35:19 +0000 (01:35 +0200)

Trivial merge