Merge proposals dependent on lp:~ubuntu-branches/debian/squeeze/empathy/squeeze-201208312033

1. Squeeze (6.0)
2. squeeze-201208312033
3. Dependent merge proposals