Fix merge r65567.

svn path=/branches/condrv_restructure/; revision=65570

diff --cc win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
Simple merge

diff --cc win32ss/user/winsrv/consrv/history.c
Simple merge

diff --cc win32ss/user/winsrv/consrv/init.c
Simple merge

diff --cc win32ss/user/winsrv/consrv/popup.c
Simple merge