]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Thu, 21 Apr 2011 11:07:58 +0000 (13:07 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 21 Apr 2011 11:07:58 +0000 (13:07 +0200)

Trivial merge