Merge proposals dependent on lp://staging/~rdoering/ubuntu/lucid/emacs23/fix-444094

1. Lucid (10.04)
2. fix-444094
3. Dependent merge proposals