Merge branch 'systemd'
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 20 Jan 2014 20:02:25 +0000 (21:02 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 20 Jan 2014 20:02:25 +0000 (21:02 +0100)

Trivial merge