Merge into master from pull request #197:

Re-add getLinkType() into LinkDiscoveryManager. (https://github.com/floodlight/floodlight/pull/197)

src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java

@@ -216,6 +216,10 @@ public class LinkDiscoveryManager
         return shuttingDown;
     }
     
+    protected ILinkDiscovery.LinkType getLinkType(LinkTuple lt, LinkInfo info) {
+    	return LinkInfo.getLinkType(lt, info);
+    }
+    
     private void doUpdatesThread() throws InterruptedException {
         do {
             LDUpdate update = updates.take();