From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Fri, 7 Feb 2014 14:01:00 +0000 (+0200)
Subject: Merge commit 'fbc48c6ab75479560919a463ba5693b44bb0e811' into merge71
X-Git-Tag: 7.2.0.beta1~177
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ad5e882b4dda5458ff16ce9c2321407a1d255ec6;p=vaadin-framework.git

Merge commit 'fbc48c6ab75479560919a463ba5693b44bb0e811' into merge71

Conflicts:
	client/src/com/vaadin/client/ui/VWindow.java

Change-Id: I6b4605ffafe990747757ec545cf2b52656c9f9f4
---

ad5e882b4dda5458ff16ce9c2321407a1d255ec6
diff --cc client/src/com/vaadin/client/ui/VWindow.java
index 964adfe303,ad9d0eac7e..705787d6c8
--- a/client/src/com/vaadin/client/ui/VWindow.java
+++ b/client/src/com/vaadin/client/ui/VWindow.java
@@@ -18,16 -18,11 +18,17 @@@ package com.vaadin.client.ui
  
  import java.util.ArrayList;
  import java.util.Arrays;
 +import java.util.Collections;
  import java.util.Comparator;
 +import java.util.List;
  
 +import com.google.gwt.aria.client.Id;
 +import com.google.gwt.aria.client.RelevantValue;
 +import com.google.gwt.aria.client.Roles;
  import com.google.gwt.core.client.Scheduler;
  import com.google.gwt.core.client.Scheduler.ScheduledCommand;
+ import com.google.gwt.dom.client.Document;
 +import com.google.gwt.dom.client.NativeEvent;
  import com.google.gwt.dom.client.Style;
  import com.google.gwt.dom.client.Style.Position;
  import com.google.gwt.dom.client.Style.Unit;