[novnc/el6: 7/7] Merge branch 'master' into el6

[Pádraig Brady]

commit b888ed4bcd0811a7197825379b16688c779ae860
Merge: fdde02b 2feebbb
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Feb 28 11:55:07 2013 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	novnc.spec
    	openstack-nova-novncproxy.init
    	openstack-nova-novncproxy.service

 novnc.spec                          |   16 +++++++++++++++-
 openstack-nova-novncproxy.init      |    4 ++--
 openstack-nova-novncproxy.service   |    3 ++-
 openstack-nova-novncproxy.sysconfig |    2 ++
 4 files changed, 21 insertions(+), 4 deletions(-)
---