fixing make check... needs to be finished
Merge branch 'devel-0.5' of codebasin:xdpd into devel-0.5
Fixing OF1.2 VLAN matching translation according to spec. OFVID_PRESENT was expected (as in OF1.3), but spec is not specifying it. fixes #15.
CHANGES file updated
Merge branch 'devel-0.4' into devel-0.5
fixed make check - adapted to new packet matches
Merge branch 'devel-0.5' of git://github.com/bisdn/xdpd into devel-0.5
Merge remote-tracking branch 'origin/devel-0.5' into pkt_in_rate_limiter
Merge remote-tracking branch 'origin/devel-0.5' into pkt_in_rate_limiter

Conflicts:
	src/xdpd/drivers/gnu_linux/test/regression/io/datapacketx86test.cc