Merge remote branch 'wtay/optimize'
authorLennart Poettering <lennart@poettering.net>
Wed, 16 Sep 2009 23:32:03 +0000 (01:32 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 16 Sep 2009 23:32:03 +0000 (01:32 +0200)

Trivial merge