From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 5 Jun 2010 06:04:15 +0000 (+0200)
Subject: Merge branch 'master' into debian
X-Git-Tag: 0.git+20100605+dfd8ee-1~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5367c44c0d47f875abc8e25a37d19ba699552ae7;p=systemd

Merge branch 'master' into debian
---

5367c44c0d47f875abc8e25a37d19ba699552ae7