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

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