Merge proposals dependent on lp://staging/ubuntu/maverick-proposed/indicator-appmenu

1. Maverick (10.10)
2. maverick-proposed
3. Dependent merge proposals