changed serval-dna version from batphone-release-0.91 to commotion-wireless
fixed merge conflict in olsrd makefile
Merge pull request #30 from opentechinstitute/serval-dna-version

changed serval-dna version from batphone-release-0.91 to commotion-wireless

tested by areynold and hawkinswnaf