HelloCompositeKevin/test_merge_conflict — pull request #1 by songjiguo (2012-01-24 06:18:32+00:00)
Title: please

Add micro_ping/micro_pong as new components for micro_benchmark

move Python scripts (tmem) into /tools

Fix merge conflicts and remove all unessassry bianries

Remove stk_policy (sicne we are using tmem_policy now)