Merge proposals dependent on lp://qastaging/~etulfetulf/ubuntu/natty/indicator-messages/indicator-messages-fix-658096

1. Natty (11.04)
2. indicator-messages-fix-658096
3. Dependent merge proposals