am d0427e49: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."

* commit 'd0427e493edf2e4de2bd60fd1cc8253e9de233fd':
  Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.