Merge proposals dependent on lp://qastaging/~zulcss/ubuntu/oneiric/nova/ubuntu-upstart-changes

lp://qastaging/~zulcss/ubuntu/oneiric/nova/ubuntu-upstart-changes has no merge proposals.