Merge branch 'master' into layoutgraph

author Leif Åstrand <leif@vaadin.com>

Tue, 10 Apr 2012 12:53:18 +0000 (15:53 +0300)

committer Leif Åstrand <leif@vaadin.com>

Tue, 10 Apr 2012 12:53:18 +0000 (15:53 +0300)
author Leif Åstrand <leif@vaadin.com>
Tue, 10 Apr 2012 12:53:18 +0000 (15:53 +0300)
committer Leif Åstrand <leif@vaadin.com>
Tue, 10 Apr 2012 12:53:18 +0000 (15:53 +0300)
diff --cc src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
Simple merge
author	Leif Åstrand <leif@vaadin.com>
	Tue, 10 Apr 2012 12:53:18 +0000 (15:53 +0300)
committer	Leif Åstrand <leif@vaadin.com>
	Tue, 10 Apr 2012 12:53:18 +0000 (15:53 +0300)