From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 17 May 2010 21:31:03 +0000 (+0200)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: 0.git+20100605+dfd8ee-1~13^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e1bd0a9fa4fa6eb0bdc5514becccc922d8a43d1;p=systemd

Merge remote branch 'origin/master'
---

9e1bd0a9fa4fa6eb0bdc5514becccc922d8a43d1