am 923f2cf0: am a89a059e: am 04104665: Merge change I911458a0 into eclair

Merge commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b'

* commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b':
  Fix x offset for boxed textures