Merge proposals dependent on lp:~rodrigo-moya/ubuntu/natty/libcanberra/fix-718805

1. Natty (11.04)
2. fix-718805
3. Dependent merge proposals