fix some CVS merge glitches that got into rev 1.7 - fixes new glRasterPos bugs
fix some CVS merge glitches that got into rev 1.7 - fixes new glRasterPos bugs

rpavlik/chromium,rpavlik/chromium,rpavlik/chromium,rpavlik/chromium,rpavlik/chromium