Merge branch 'master' into layoutgraph

author Jouni Koivuviita <jouni@jounikoivuviita.com>

Fri, 18 May 2012 17:59:25 +0000 (20:59 +0300)

committer Jouni Koivuviita <jouni@jounikoivuviita.com>

Fri, 18 May 2012 17:59:25 +0000 (20:59 +0300)
author Jouni Koivuviita <jouni@jounikoivuviita.com>
Fri, 18 May 2012 17:59:25 +0000 (20:59 +0300)
committer Jouni Koivuviita <jouni@jounikoivuviita.com>
Fri, 18 May 2012 17:59:25 +0000 (20:59 +0300)
diff --cc src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
Simple merge
diff --cc src/com/vaadin/terminal/gwt/client/ServerConnector.java
Simple merge
diff --cc src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java
Simple merge
author	Jouni Koivuviita <jouni@jounikoivuviita.com>
	Fri, 18 May 2012 17:59:25 +0000 (20:59 +0300)
committer	Jouni Koivuviita <jouni@jounikoivuviita.com>
	Fri, 18 May 2012 17:59:25 +0000 (20:59 +0300)
		1	2
src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ServerConnector.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java	patch \|	diff1 \|	diff2 \|	blob \| history