Merge branch 'master' into layoutperformance

author Leif Åstrand <leif@vaadin.com>

Thu, 9 Feb 2012 12:51:41 +0000 (14:51 +0200)

committer Leif Åstrand <leif@vaadin.com>

Thu, 9 Feb 2012 12:51:41 +0000 (14:51 +0200)
author Leif Åstrand <leif@vaadin.com>
Thu, 9 Feb 2012 12:51:41 +0000 (14:51 +0200)
committer Leif Åstrand <leif@vaadin.com>
Thu, 9 Feb 2012 12:51:41 +0000 (14:51 +0200)
diff --cc src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
Simple merge
diff --cc src/com/vaadin/terminal/gwt/client/VPaintableMap.java
Simple merge
author	Leif Åstrand <leif@vaadin.com>
	Thu, 9 Feb 2012 12:51:41 +0000 (14:51 +0200)
committer	Leif Åstrand <leif@vaadin.com>
	Thu, 9 Feb 2012 12:51:41 +0000 (14:51 +0200)
		1	2
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/VPaintableMap.java	patch \|	diff1 \|	diff2 \|	blob \| history