[systemd: 8/8] Merge branch 'master' into f22

[Michal Schmidt]

commit 68864dcf857cfb64879e372961000aab32232487
Merge: 2c67f7f 5decfd3
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Wed Feb 18 08:46:39 2015 +0100

    Merge branch 'master' into f22
    
    Sew diverged branches.

---