]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Tue, 17 Aug 2010 08:45:08 +0000 (10:45 +0200)
committerTollef Fog Heen <tfheen@err.no>
Tue, 17 Aug 2010 08:45:08 +0000 (10:45 +0200)

Trivial merge