Merge proposals dependent on lp://staging/~bkerensa/ubuntu/quantal/xvid4conf/fix-for-control

1. Quantal (12.10)
2. fix-for-control
3. Dependent merge proposals