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

Trivial merge