dana-i2cat/opennaas — pull request #35 by jordi-puig (2012-03-07 17:14:26+00:00)
Title: Develop

Merge conflict from OSPF & GRE features resolved.
Skipped two tests. These test must be activated when the issue http://jira.i2cat.net:8080/browse/OPENNAAS-222 is resolved.