kune til local urls
kune modifications til local urls
Merge branch 'trunk' into kune

Conflicts:
	src/org/waveprotocol/box/server/ServerMain.java
	src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/gadget/GadgetInfoWidget.ui.xml
merged with trunk
Merge branch 'trunk' into kune-may02
Add control-k shortckut to links
Merged with head and added ctrl-k
Minor changes (Auth login public)
merge with trunk
resolved conflict
Resolved flickering
Merge branch 'parpadeo-avatars' into kune-may2012
Enable long pastes
Merge branch 'long-paste' into kune-may2012
patch updated with kune trunk
Add websocket configurable address
Merge branch 'trunk' into websocket-subdomain
jetty updated
jetty updated
Merge branch 'jetty-last' into kune-may2012