Conflicts:
	src/main/java/net/floodlightcontroller/core/internal/CmdLineSettings.java
	src/main/java/net/floodlightcontroller/core/internal/Controller.java
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
	src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
	src/main/java/net/floodlightcontroller/topology/internal/TopologyImpl.java
	src/test/java/net/floodlightcontroller/staticflowentry/StaticFlowEntryPusherTest.java

Catch illformated event-history count cases.

speed up staticflowpusher unittests (https://github.com/floodlight/floodlight/pull/25)

was 50s to run, now 2s

added Unittest
code submitted from  roberto.doriguzzi@create-net.org
    Thanks!

log msg cleanup (https://github.com/floodlight/floodlight/pull/24)

Adding isTruncated field to the IPv4. It is set to true of the totalLength doesn't match the byte[] length during deserialization.

remove a log msg, show packetIn in packetIn toString()src/main/java/net/floodlightcontroller/core/internal/Controller.java

Fixed JUnit tests.

Add a command line option to change the number of threads. (https://github.com/floodlight/floodlight/pull/22)

Event-history for topology related events: switch connects/disconnects, links ups/downs, cluster merge/splits.

Move switch locking code from IOFSwitch interface to OFSwitchImpl. (https://github.com/floodlight/floodlight/pull/21)

Works since only Controller needs to lock.