Merge changes Ib85ed842,I74d3677b into devel
authorOrtiz, Samuel <samuel.ortiz@intel.com>
Fri, 27 Jul 2012 07:52:38 +0000 (00:52 -0700)
committerGerrit Code Review <gerrit2@tzgerrit>
Fri, 27 Jul 2012 07:52:38 +0000 (00:52 -0700)
* changes:
  compact nfc 3.0.8
  x86 pn544 blackbay


Trivial merge