]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Sat, 5 Jun 2010 06:04:15 +0000 (08:04 +0200)
committerTollef Fog Heen <tfheen@err.no>
Sat, 5 Jun 2010 06:04:15 +0000 (08:04 +0200)

Trivial merge