Merge change I911458a0 into eclair

* changes:
  Fix x offset for boxed textures