Merge proposals dependent on lp://qastaging/~ubuntu-branches/ubuntu/oneiric/xorg-server/oneiric-201109091216

lp://qastaging/~ubuntu-branches/ubuntu/oneiric/xorg-server/oneiric-201109091216 has no merge proposals.