Merge "Merge from master to CA branch" into connectivity-abstraction

author Sudarshan Prasad <sudarshan.prasad@intel.com>

Thu, 25 Dec 2014 11:03:15 +0000 (11:03 +0000)

committer Gerrit Code Review <gerrit@172.30.200.205>

Thu, 25 Dec 2014 11:03:15 +0000 (11:03 +0000)
author Sudarshan Prasad <sudarshan.prasad@intel.com>
Thu, 25 Dec 2014 11:03:15 +0000 (11:03 +0000)
committer Gerrit Code Review <gerrit@172.30.200.205>
Thu, 25 Dec 2014 11:03:15 +0000 (11:03 +0000)
diff --cc resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp
Simple merge
author	Sudarshan Prasad <sudarshan.prasad@intel.com>
	Thu, 25 Dec 2014 11:03:15 +0000 (11:03 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.205>
	Thu, 25 Dec 2014 11:03:15 +0000 (11:03 +0000)