From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 16 Jan 2011 10:00:53 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Tag: 16-1~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bccfbb85a534780093cfc59ca4024ce5ddaa9632;p=systemd

Merge branch 'master' into debian
---

bccfbb85a534780093cfc59ca4024ce5ddaa9632