Merge proposals dependent on lp://qastaging/~jbicha/ubuntu/oneiric/gnome-color-manager/3.2

1. Oneiric (11.10)
2. 3.2
3. Dependent merge proposals