dana-i2cat/opennaas — pull request #281 by jordi-puig (2012-09-14 10:20:32+00:00)
Title: Compilation error by a conflict with two simultaneous pull-request

Compilation error generated by a conflict of two simultaneous pull-request