Merge proposals dependent on lp://qastaging/~etherpad/etherpad/ubuntu-lucid-backport

lp://qastaging/~etherpad/etherpad/ubuntu-lucid-backport has no merge proposals.