]> err.no Git - systemd/commitdiff
Merge commit 'v16'
authorTollef Fog Heen <tfheen@err.no>
Fri, 14 Jan 2011 21:04:37 +0000 (22:04 +0100)
committerTollef Fog Heen <tfheen@err.no>
Fri, 14 Jan 2011 21:04:37 +0000 (22:04 +0100)

Trivial merge