Merge commit '6bf96861b98e91ca9c3bd146697580b42d30f5d9'

diff --cc packages/gnome-c-style/gnome-c-align.el
Simple merge

diff --cc packages/gnome-c-style/gnome-c-snippet.el
Simple merge

diff --cc packages/gnome-c-style/gnome-c-style.el
Simple merge