Merge branch 'devel' of git://uglyman.kremlin.cc/git/systemd-utl into devel
authorkremlin <ian@kremlin.cc>
Fri, 15 Aug 2014 20:00:28 +0000 (15:00 -0500)
committerkremlin <ian@kremlin.cc>
Fri, 15 Aug 2014 20:00:28 +0000 (15:00 -0500)

Trivial merge