Brackets make compilation on older versions of gcc
Fixed critical bug in __of1x_get_time_ms() for 32bit compilers leading to dead-lock in timers.
Merge remote-tracking branch 'origin/devel-0.4' into devel-0.5

Conflicts:
	CHANGES
Merge branch 'devel-0.4' of github.com:bisdn/rofl-core into devel-0.4
Made simpler change to initialise tmp
Merge remote-tracking branch 'origin/devel-0.4' into devel-0.5
fixes #28
crofconn.cc => method recv_message() => fixed bug => check for multipart messages MORE flag always succeeded, because instead of the stats flags, the type was checked. truly a bug. fixes #28
Merge branch 'akoepsel/devel-0.5/working' into devel-0.5
Merge branch 'ofp_desc_fix' into devel-0.5
Merge branch 'devel-0.5' into devel-0.6