Merge proposals dependent on lp://qastaging/~psusi/ubuntu/natty/gnome-power-manager/fix-duplicate-battery

1. Natty (11.04)
2. fix-duplicate-battery
3. Dependent merge proposals