am 8c30a47d: am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread

* commit '8c30a47d801be50272098e60d0079ae1b4ebd22a':
  Corrected MIFARE default key set