Merge branch '2.0' of tizen:profile/ivi/libwebsockets into 2.0
authorKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 7 Mar 2013 21:37:49 +0000 (13:37 -0800)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 7 Mar 2013 21:37:49 +0000 (13:37 -0800)

Trivial merge