Merge proposals dependent on lp://qastaging/~ubuntu-branches/ubuntu/precise/ubuntu-docs/precise-201202051639

1. Precise (12.04)
2. precise-201202051639
3. Dependent merge proposals