Clean merge

try  NR 2

maybe this time @blueness should check the branch locally for testing instead of just clicking on merge and then switching into PANIC mode and undoing it without any explanation because 2 or 3 idiotic changes were not merged from systemd. (because he didn't merge it before the commit i based my merge work on, and i assumed everything important up to 1e60f44be995edf571ece7 was already merged), which is apparently not the case so there are some minor bits not exactly the same as in systemd code - which can be expected from a fork.