new class: logging
cmemory: removed method c_str() => leading to lots of changes in the surrounding classes
configure.ac => changed version identifier to 0.4.0
added CHANGES file
adjusted code examples to changes on coxmatch_ofb_vlan_vid
Merge branch 'andi_vlan_vid' into devel-0.4
CHANGES: * Fixed a bug in handling of OXM TLVs of type VLAN_VID
introducing OFP namespaces to endpoint
OFP namespaces => adapted cofinst
intermediate commit
intermediate commit
Merge branch 'devel-0.3' into merge2

Conflicts:
	src/rofl/common/openflow/cgroupentry.cc
	src/rofl/common/openflow/cgroupentry.h
Merge branch 'devel-0.4' into ofp_namespaces

Conflicts:
	src/rofl/common/openflow/cgroupentry.cc
	src/rofl/common/openflow/cgroupentry.h
OFP namespaces => intermediate safety commit
Documentation of groups and statistics
deleted unused cutils.h from /src/rofl/datapath/pipeline/platform
Created lock_inline.h.skel to hold the inline implementations of the locking functions
Added also structure for inline atomic operations
Added likely.h and skel file for customization
Added some likely and unlikely in timers and statistics. Missing all the rest of the pipeline