Merge branch 'master' into journal

diff --cc Makefile.am
Simple merge

diff --cc TODO
index b993a6b2eb543576feb08e64a391ca91a39149f7,5303497164f70d1402a732a2f552a4e7b1a1c1fc..8c3034e079c734fdc3a14824927065526980545a
--- 1/TODO
--- 2/TODO
+++ b/TODO
@@@ -17,14 -17,16 +17,20 @@@ Bugfixes
  
  * make polkit checks async
  
 +* properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point.
 +
  Features:
  
 +* check utf8 everywhere
 +
+ * when an instanced service exits, remove its parent cgroup too if possible.
+ 
+ * as Tom Gundersen pointed out there's a always a dep loop if people use crypto file systems with random keys
+ 
  * unset container= in PID1?
  
+ * automatically escape unit names passed on the service (i.e. think "systemctl start serial-getty.service@serial/by-path/jshdfjsdfhkjh" being automatically escaped as necessary.
+ 
  * if we can not get user quota for tmpfs, mount a separate tmpfs instance
    for every user in /run/user/$USER with a configured maximum size
  

diff --cc src/manager.c
Simple merge

diff --cc src/systemctl.c
Simple merge