Merge commit 'origin/master' into master-tx
authorLennart Poettering <lennart@poettering.net>
Wed, 17 Jun 2009 21:43:50 +0000 (23:43 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 17 Jun 2009 21:43:50 +0000 (23:43 +0200)

Trivial merge