From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 14 Jan 2011 21:04:37 +0000 (+0100)
Subject: Merge commit 'v16'
X-Git-Tag: 16-1~16^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0acc99ff21bb48f5fd54163bf716250df979c8a7;p=systemd

Merge commit 'v16'
---

0acc99ff21bb48f5fd54163bf716250df979c8a7