commit c12446403e348c3d6f2763bcd370cea3e6b601d1
Author: Andrew Beekhof <andrew@beekhof.net>
Date:   Mon Feb 3 14:44:51 2014 +1100

    Fix: Bug rhbz#1057697 - Use native DBus library for upstart support to avoid problematic use of threads
    
    (cherry picked from commit d7996e792844b98021061bd8ae74ab929f9b8ba7)
    
    Conflicts:
    	lib/services/upstart.c

diff --git a/configure.ac b/configure.ac
index 628f46f..f90ccdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1173,7 +1173,7 @@ AC_CHECK_TYPES([DBusBasicValue],,,[[#include <dbus/dbus.h>]])
 
 if test $HAVE_dbus = 1 -a "x${enable_upstart}" != xno; then
    HAVE_upstart=0
-   PCMK_FEATURES="$PCMK_FEATURES upstart"
+   dnl PCMK_FEATURES="$PCMK_FEATURES upstart"
 fi
 
 AC_DEFINE_UNQUOTED(SUPPORT_UPSTART, $HAVE_upstart, Support upstart based system services)
diff --git a/lib/services/dbus.c b/lib/services/dbus.c
index a9b1eba..66a98a0 100644
--- a/lib/services/dbus.c
+++ b/lib/services/dbus.c
@@ -141,7 +141,6 @@ DBusMessage *pcmk_dbus_send_recv(DBusMessage *msg, DBusConnection *connection, D
             reply = NULL;
         }
     }
-    crm_trace("Was error: '%s' '%s'", error->name, error->message);
 
     if(pending) {
         /* free the pending message handle */