Merge proposals dependent on lp://staging/~ubuntu-x-swat/xorg-server/xsmoke

lp://staging/~ubuntu-x-swat/xorg-server/xsmoke has no merge proposals.