From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 27 May 2010 20:59:40 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 0.git+20100605+dfd8ee-1~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f661af32132792b5f41962104bb2d5187d3fa7b;p=systemd

Merge branch 'master' into debian
---

8f661af32132792b5f41962104bb2d5187d3fa7b