VNC console not working

I'm having some trouble getting VNC console working in the Dashboard. I've read over all the other threads here and have followed the help given in those. First question: Is it still necessary to merge lp:~sleepsonthefloor/openstack-dashboard/vnc_console into the trunk of lp:openstack-dashboard? When I try it, it fails with conflicts. If that's still necessary, do I need to use specific revisions to get them merged successfully?

If I try setting it up without the merge, I get the VNC console button for instances in the dashboard. When I click it, a new browser window comes up and noVNC seems to start loading, but then hangs. I see a frame with "Loading" and a "CtrlAltDelete" button. I'm not seeing any errors in the nova-vncproxy.log. I have the following flags in nova.conf:

--vncproxy_url=http://192.168.72.186:6080
--vnc_enabled=true
--vncproxy_host=192.168.72.186
--vnc_debug=false

I am starting nova-vncproxy with these flags: --vncproxy_wwwroot /var/lib/nova/noVNC --flagfile=/etc/nova/nova.conf. I got noVNC from https://github.com/openstack/noVNC.git and copied it to /var/lib/nova/. I am able to connect to the VM using a standalone VNC app. I've tried loading the VNC console using both Firefox 4 and Chrome. Below is the output from nova-vncproxy.log. Any help would be greatly appreciated.

Thanks
Dave Thomas

from nova-vncproxy.log:

2011-06-16 11:23:09,006 DEBUG nova.rpc [-] received {u'_msg_id': u'9da7b88396334ca3ae57ef133a2a807c', u'_context_read_deleted': False, u'_context_request_id': u'C-64UDX5XCXMEGY17YKO', u'args': {u'token': u'763f078f-0946-4a83-82d1-38e22be187f7', u'host': u'e3-node-004', u'port': u'5900'}, u'_context_is_admin': True, u'_context_timestamp': u'2011-06-16T15:23:08Z', u'_context_user': u'novaadmin', u'method': u'authorize_vnc_console', u'_context_project': u'testproject', u'_context_remote_address': u'10.10.2.101'} from (pid=15011) _receive /usr/lib/pymodules/python2.7/nova/rpc.py:167
2011-06-16 11:23:09,007 DEBUG nova.rpc [-] unpacked context: {'timestamp': u'2011-06-16T15:23:08Z', 'remote_address': u'10.10.2.101', 'project': u'testproject', 'is_admin': True, 'user': u'novaadmin', 'request_id': u'C-64UDX5XCXMEGY17YKO', 'read_deleted': False} from (pid=15011) _unpack_context /usr/lib/pymodules/python2.7/nova/rpc.py:331
2011-06-16 11:23:09,007 AUDIT nova.vnc-proxy [-] Received Token: 763f078f-0946-4a83-82d1-38e22be187f7, {'host': u'e3-node-004', 'last_activity_at': 1308237789.007703, 'port': u'5900'})
2011-06-16 11:23:09,105 DEBUG nova.rpc [-] Making asynchronous call on vncproxy ... from (pid=15011) call /usr/lib/pymodules/python2.7/nova/rpc.py:350
2011-06-16 11:23:09,106 DEBUG nova.rpc [-] MSG_ID is 6e39e7f8300c4f3083d923f5c53f24df from (pid=15011) call /usr/lib/pymodules/python2.7/nova/rpc.py:353
2011-06-16 11:23:09,308 DEBUG nova.rpc [-] received {u'_msg_id': u'6e39e7f8300c4f3083d923f5c53f24df', u'_context_read_deleted': False, u'_context_request_id': u'URDV6-PICHH0P6RRW218', u'args': {u'token': u'763f078f-0946-4a83-82d1-38e22be187f7'}, u'_context_is_admin': True, u'_context_timestamp': u'2011-06-16T15:23:09Z', u'_context_user': None, u'method': u'check_token', u'_context_project': None, u'_context_remote_address': None} from (pid=15011) _receive /usr/lib/pymodules/python2.7/nova/rpc.py:167
2011-06-16 11:23:09,309 DEBUG nova.rpc [-] unpacked context: {'timestamp': u'2011-06-16T15:23:09Z', 'remote_address': None, 'project': None, 'is_admin': True, 'user': None, 'request_id': u'URDV6-PICHH0P6RRW218', 'read_deleted': False} from (pid=15011) _unpack_context /usr/lib/pymodules/python2.7/nova/rpc.py:331
2011-06-16 11:23:09,309 AUDIT nova.vnc-proxy [-] Checking Token: 763f078f-0946-4a83-82d1-38e22be187f7, True)
2011-06-16 11:23:09,392 INFO nova.vnc-proxy [-] Received Request: http://192.168.72.186:6080/vnc_auto.html?token=763f078f-0946-4a83-82d1-38e22be187f7&host=hostignore&port=portignore
2011-06-16 11:23:09,524 INFO nova.vnc-proxy [-] Received Request: http://192.168.72.186:6080/include/web-socket-js/WebSocketMain.swf?0.29007450751040686