Merge proposals dependent on lp://qastaging/~nalimilan/ubuntu/maverick/gnome-system-tools/gnome-system-tools-fix-433654

1. Maverick (10.10)
2. gnome-system-tools-fix-433654
3. Dependent merge proposals