msg.error once.
Merge branch 'master' of github.com:Floobits/floobits-emacs
Merge master. Fix conflict.