]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Thu, 29 Jul 2010 13:47:23 +0000 (15:47 +0200)
committerTollef Fog Heen <tfheen@err.no>
Thu, 29 Jul 2010 13:47:23 +0000 (15:47 +0200)

Trivial merge