am 04104665: Merge change I911458a0 into eclair

Merge commit '04104665271248719cb3659e42938fa4bec0261e' into eclair-mr2

* commit '04104665271248719cb3659e42938fa4bec0261e':
  Fix x offset for boxed textures