Merge proposals dependent on lp:ubuntu/precise-proposed/xserver-xorg-video-trident-lts-trusty

1. Precise (12.04)
2. precise-proposed
3. Dependent merge proposals