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

Trivial merge