Bug 1046518 - [NFC] nfcd code cleanup. r=allstars.chh
Merge pull request #38 from DimiL/bug_1046518

Bug 1046518 - [NFC] nfcd code cleanup. r=allstars.chh