]> err.no Git - systemd/commitdiff
Merge commit 'v18'
authorTollef Fog Heen <tfheen@err.no>
Thu, 17 Feb 2011 06:35:48 +0000 (07:35 +0100)
committerTollef Fog Heen <tfheen@err.no>
Thu, 17 Feb 2011 06:35:48 +0000 (07:35 +0100)

Trivial merge