bz 1059417,1056892 -- Handle interface names containing "." or "-"

This updates the previous patch to also handle interface names
containing "-".
Merge pull request #112 from larsks/bz/1059417

bz 1059417,1056892 -- Handle interface names containing "." or "-"