yqzhang/Network-Communication — pull request #4 by qdx (2013-02-17 19:54:15+00:00)
Title: Resolved the conflicts

Please pull master this time