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

Merge remote branch 'origin/master'
---

7cef6a4d8a7132c72db7ef4a43b71dfd7d51a394