Merge changes I352cb3c2,I94b43501 into devel
authorOrtiz, Samuel <samuel.ortiz@intel.com>
Fri, 27 Jul 2012 07:53:49 +0000 (00:53 -0700)
committerGerrit Code Review <gerrit2@tzgerrit>
Fri, 27 Jul 2012 07:53:49 +0000 (00:53 -0700)
* changes:
  config-tizen: enable pn544 hci option
  fix compilation by remove duplicate definition


Trivial merge