]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Mon, 17 May 2010 21:36:54 +0000 (23:36 +0200)
committerTollef Fog Heen <tfheen@err.no>
Mon, 17 May 2010 21:36:54 +0000 (23:36 +0200)

Trivial merge