]> err.no Git - systemd/commitdiff
Merge commit 'v17'
authorTollef Fog Heen <tfheen@err.no>
Sun, 13 Feb 2011 07:27:49 +0000 (08:27 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sun, 13 Feb 2011 07:27:49 +0000 (08:27 +0100)

Trivial merge