Fix build on -CURRENT. Image.cc was trying to define a variable named "or." Thank you: wpaul
though.
PR: 29461 Submitted by: Adam Weinberger <monkey@crackula.com>, \ Scott Renfro <scott@renfro.org> (additional patches)