Merge proposals dependent on lp:~stewart/drizzle/fix-gcc46-build

lp:~stewart/drizzle/fix-gcc46-build has no merge proposals.