fix merge conflict gibberish
Reported by Nathaniel Cunningham
Update python-mode to version 6.1.2
* lisp/isearch.el (isearch-mode-map): Bind [return] and [backspace] to
isearch-exit and isearch-delete-char resp.  (Bug#16342, bug#16035)

* lisp/progmodes/ps-mode.el (ps-mode-map): Remove [return] key binding
that shadows RET.

Conflicts:
	lisp/ChangeLog