]> err.no Git - systemd/commitdiff
Merge branch 'master' into debian
authorTollef Fog Heen <tfheen@err.no>
Wed, 29 Jun 2011 11:52:32 +0000 (13:52 +0200)
committerTollef Fog Heen <tfheen@err.no>
Wed, 29 Jun 2011 11:52:32 +0000 (13:52 +0200)

Trivial merge