Merge from emacs-24; up to 2012-12-25T17:37:29Z!eliz@gnu.org
[bpt/emacs.git] / lisp / bookmark.el
1