]> err.no Git - systemd/commitdiff
Merge commit 'v40'
authorTollef Fog Heen <tfheen@err.no>
Tue, 7 Feb 2012 20:36:03 +0000 (21:36 +0100)
committerTollef Fog Heen <tfheen@err.no>
Tue, 7 Feb 2012 20:36:03 +0000 (21:36 +0100)

Trivial merge