Merge proposals dependent on lp://staging/ubuntu/oneiric-proposed/indicator-weather

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