[novnc/el6] (7 commits) ...Merge branch 'master' into el6

[Pádraig Brady]

Summary of changes:

  4c1aa28... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  5a924f6... Moves to the 0.4.0 upstream version of the code (*)
  cfa0661... Fixes the supplied init script to match the new 0.4 version (*)
  d9dbcbf... fix typo in init script description (*)
  ba64289... - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass (*)
  2feebbb... support /etc/sysconfig/openstack-nova-novncproxy #916479 (*)
  b888ed4... Merge branch 'master' into el6

(*) This commit already existed in another branch; no separate mail sent