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

Merge branch 'master' into debian
---

b3104d6652af9e57efe9bf1ba6dea7f2b7576c2d