* Merge with Debian unstable. Remaining Ubuntu changes:
  - Install into / rather than /usr.
  - debian/dbus.postinst: Use upstart call instead of invoking the init.d
    script for checking if we are already running. 
  - Add debian/dbus.upstart.
  - 0001-activation-allow-for-more-variation-than-just-system.patch,
    0002-bus-change-systemd-activation-to-activation-systemd.patch,
    0003-upstart-add-upstart-as-a-possible-activation-type.patch,
    0004-upstart-add-UpstartJob-to-service-desktop-files.patch,
    0005-activation-implement-upstart-activation.patch: Patches from Scott
    James Remnant to implement Upstart service activation. Not upstream.
  - 20_system_conf_limit.patch: Increase max_match_rules_per_connection for
    the system bus to 5000 (LP #454093)
  - 81-session.conf-timeout.patch: Raise the service startup timeout from 25
    to 60 seconds. It may be too short on the live CD with slow machines.
* debian/rules: Fix creation of /usr/lib/libdbus-1.so symlink.
* debian/libdbus-1-dev.install: Put back .pc.