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

* commit '47e6ccb65ab0088cf04809c234cdb5f747579c8c':
  Corrected MIFARE default key set