Merge branch 'master' of ssh://git.freedesktop.org/git/systemd

diff --combined src/systemctl.c
index d90471773ecb2b6c9fdc0ed0058a703c1e501df0,666cebfcdb094bfefa692165a86db4bdf56be5fb..05e6ac91478d60fc2911f8335461a995f23c2569
--- 1/src/systemctl.c
--- 2/src/systemctl.c
+++ b/src/systemctl.c
@@@ -1100,9 -1100,6 +1100,6 @@@ static void print_status_info(UnitStatu
          else if (i->what)
                  printf("\t    What: %s\n", i->what);
  
-         if (i->status_text)
-                 printf("\t  Status: \"%s\"\n", i->status_text);
- 
          if (i->accept)
                  printf("\tAccepted: %u; Connected: %u\n", i->n_accepted, i->n_connections);
  
@@@ -1175,6 -1172,9 +1172,9 @@@
                  printf("\n");
          }
  
+         if (i->status_text)
+                 printf("\t  Status: \"%s\"\n", i->status_text);
+ 
          if (i->default_control_group) {
                  unsigned c;
  
@@@ -3056,7 -3056,7 +3056,7 @@@ static int talk_upstart(void) 
          if (utmp_get_runlevel(&previous, NULL) < 0)
                  previous = 'N';
  
 -        if (!(bus = dbus_connection_open("unix:abstract=/com/ubuntu/upstart", &error))) {
 +        if (!(bus = dbus_connection_open_private("unix:abstract=/com/ubuntu/upstart", &error))) {
                  if (dbus_error_has_name(&error, DBUS_ERROR_NO_SERVER)) {
                          r = 0;
                          goto finish;
@@@ -3120,10 -3120,8 +3120,10 @@@ finish
          if (reply)
                  dbus_message_unref(reply);
  
 -        if (bus)
 +        if (bus) {
 +                dbus_connection_close(bus);
                  dbus_connection_unref(bus);
 +        }
  
          dbus_error_free(&error);
  
@@@ -3446,10 -3444,8 +3446,10 @@@ int main(int argc, char*argv[]) 
  
  finish:
  
 -        if (bus)
 +        if (bus) {
 +                dbus_connection_close(bus);
                  dbus_connection_unref(bus);
 +        }
  
          dbus_error_free(&error);