Package adjustments to support emacs 23 (for my raspi).