Merge proposals dependent on lp:~ubuntu-branches/ubuntu/oneiric/gnome-tweak-tool/oneiric-201108220805

1. Oneiric (11.10)
2. oneiric-201108220805
3. Dependent merge proposals