Merge branch 'websocket-transport'
authorKrisztian Litkey <krisztian.litkey@intel.com>
Fri, 1 Feb 2013 16:38:46 +0000 (18:38 +0200)
committerKrisztian Litkey <krisztian.litkey@intel.com>
Fri, 1 Feb 2013 16:38:46 +0000 (18:38 +0200)

Trivial merge