Merge remote branch 'origin/master' into layoutgraph

author Leif Åstrand <leif@vaadin.com>

Thu, 5 Apr 2012 10:53:51 +0000 (13:53 +0300)

committer Leif Åstrand <leif@vaadin.com>

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