Merge

--HG--
extra : convert_revision : 8690e31b64235874d74ea4a1123a408610fb115b

diff --cc base/loader/elf_object.cc
Simple merge

diff --cc dev/alpha_console.cc
Simple merge

diff --cc dev/console.cc
Simple merge