Merge proposals dependent on lp:~veebers/autopilot/fix-gir-gconf

lp:~veebers/autopilot/fix-gir-gconf has no merge proposals.