Merge proposals dependent on lp:~upstart-devel/upstart/1.6

lp:~upstart-devel/upstart/1.6 has no merge proposals.