Merge remote branch 'origin/master' into windowing

author Leif Åstrand <leif@vaadin.com>

Thu, 10 Nov 2011 11:51:38 +0000 (13:51 +0200)

committer Leif Åstrand <leif@vaadin.com>

Thu, 10 Nov 2011 11:51:38 +0000 (13:51 +0200)
author Leif Åstrand <leif@vaadin.com>
Thu, 10 Nov 2011 11:51:38 +0000 (13:51 +0200)
committer Leif Åstrand <leif@vaadin.com>
Thu, 10 Nov 2011 11:51:38 +0000 (13:51 +0200)
diff --cc src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
Simple merge
diff --cc src/com/vaadin/terminal/gwt/client/ui/VWindow.java
Simple merge
author	Leif Åstrand <leif@vaadin.com>
	Thu, 10 Nov 2011 11:51:38 +0000 (13:51 +0200)
committer	Leif Åstrand <leif@vaadin.com>
	Thu, 10 Nov 2011 11:51:38 +0000 (13:51 +0200)
		1	2
src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/VWindow.java	patch \|	diff1 \|	diff2 \|	blob \| history