]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Thu, 20 May 2010 18:17:48 +0000 (20:17 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 20 May 2010 18:17:48 +0000 (20:17 +0200)

Trivial merge