From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 7 Jul 2010 20:02:15 +0000 (+0200)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: 8-2~25^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14681ed3fe3b01013f28722c22a68c278c53d2f9;p=systemd

Merge remote branch 'origin/master'
---

14681ed3fe3b01013f28722c22a68c278c53d2f9