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)
commitbb4179e947d246969c6e5b051f932884f75ebb31
tree692b987d34bc7f74fcf7a19b402e1feb77c1833e
parent90d69f7960122a85681966d365e8f4372abc821b
parentb85ed8429a20819080d62943e6ea13325e9af673
Merge changes Ib85ed842,I74d3677b into devel

* changes:
  compact nfc 3.0.8
  x86 pn544 blackbay