From: Artur Signell <artur@vaadin.com>
Date: Fri, 23 Mar 2012 07:01:11 +0000 (+0200)
Subject: Merge commit '06bbbce73348bded241c0fb856c6bacb39793e89'
X-Git-Tag: 7.0.0.alpha2~235
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7f974b6d45957aaf20268e78fa94c7857152df70;p=vaadin-framework.git

Merge commit '06bbbce73348bded241c0fb856c6bacb39793e89'

Did not merge any changes as debug id is handled differently in Vaadin 7

Conflicts:
	src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
	src/com/vaadin/terminal/gwt/client/ComponentLocator.java
	src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
---

7f974b6d45957aaf20268e78fa94c7857152df70