Merge commit 'ce7a757fd9ecb99c4f54cfde5cf5ef9a9e7819fc^' into HEAD

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc gcc/config.gcc
Simple merge

diff --cc libgm2/libm2cor/Makefile.in
Simple merge

diff --cc libgm2/libm2iso/Makefile.in
Simple merge

diff --cc libgm2/libm2log/Makefile.in
Simple merge

diff --cc libgm2/libm2pim/Makefile.in
Simple merge