Merge change from trunk that makes it possible to build Upstart using
a previously built copy of nih-dbus-tool, especially useful when
cross-compiling.  LP: #426740.
6 files changed