--amend
Merge branch 'master' of https://github.com/trema/trema
Merge branch 'master' of https://github.com/trema/trema
Merge branch 'master' of https://github.com/trema/trema
Merge branch 'master' of https://github.com/trema/trema
correct executable path of oflops
ruby benchmarking program converted from c equivalent
added transaction_id attribute
Merge https://github.com/nickkaranatsios/trema into backup

Conflicts:
	ruby/trema/packet_in.c
	src/examples/cbench_switch/cbench-switch.rb
Merge branch 'backup' of https://github.com/nickkaranatsios/trema into backup
work backup