chiark / gitweb /
Merge remote branch 'kay/master'
authorLennart Poettering <lennart@poettering.net>
Wed, 3 Feb 2010 11:40:29 +0000 (12:40 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 3 Feb 2010 11:40:29 +0000 (12:40 +0100)

Trivial merge