Merge commit '04104665271248719cb3659e42938fa4bec0261e' into eclair-mr2 * commit '04104665271248719cb3659e42938fa4bec0261e': Fix x offset for boxed textures
Merge commit '04104665271248719cb3659e42938fa4bec0261e' into eclair-mr2 * commit '04104665271248719cb3659e42938fa4bec0261e': Fix x offset for boxed textures