Merge proposals dependent on lp:~ken-vandine/ubuntu/maverick/empathy/maverick_call_notifications

1. Maverick (10.10)
2. maverick_call_notifications
3. Dependent merge proposals