Merge "Don\'t redefine B_PACK_CHARS"
am: 478259b574

* commit '478259b574b6353437b6d5a03caaa4449add428a':
  Don't redefine B_PACK_CHARS