chiark / gitweb /
Merge remote-tracking branch 'harald/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 11 Jul 2011 20:39:57 +0000 (22:39 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 11 Jul 2011 20:39:57 +0000 (22:39 +0200)

Trivial merge