From: Jouni Koivuviita <jouni@jounikoivuviita.com>
Date: Thu, 12 Apr 2012 08:17:06 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into layoutgraph
X-Git-Tag: 7.0.0.beta1~280
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dbb827bd737244a58bb35c670aa2101c482831fd;p=vaadin-framework.git

Merge remote-tracking branch 'origin/master' into layoutgraph
---

dbb827bd737244a58bb35c670aa2101c482831fd
diff --cc src/com/vaadin/terminal/gwt/client/LayoutManager.java
index cc9b8ae68f,4338f1284a..6039452ab4
--- a/src/com/vaadin/terminal/gwt/client/LayoutManager.java
+++ b/src/com/vaadin/terminal/gwt/client/LayoutManager.java
@@@ -18,9 -18,7 +18,8 @@@ import com.google.gwt.user.client.Timer
  import com.vaadin.terminal.gwt.client.MeasuredSize.MeasureResult;
  import com.vaadin.terminal.gwt.client.ui.ManagedLayout;
  import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
 +import com.vaadin.terminal.gwt.client.ui.PreLayoutListener;
  import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
- import com.vaadin.terminal.gwt.client.ui.VNotification;
  import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeEvent;
  import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeListener;
  import com.vaadin.terminal.gwt.client.ui.layout.LayoutDependencyTree;