Merge proposals dependent on lp:~om26er/ubuntu/maverick/nautilus/nautilus-fix-683972

1. Maverick (10.10)
2. nautilus-fix-683972
3. Dependent merge proposals