Merge proposals dependent on lp://staging/~jpickett/ubuntu/oneiric/ubuntu-docs/fix-for-804855

lp://staging/~jpickett/ubuntu/oneiric/ubuntu-docs/fix-for-804855 has no merge proposals.