Merge remote branch 'origin/master' into windowing

diff --cc build/build.xml
index 6b23f7f31d4adf0ff4d86a3cc7ecdb405164cd05,7453d55a5cac500bc4ab44a9294bf2066a22ad19..c63a46ac51823a83c0e6d7dc0ed07d38fa93e7ae
--- 1/build/build.xml
--- 2/build/build.xml
+++ b/build/build.xml
@@@ -373,9 -330,7 +330,8 @@@
                  <exclude name="**/.svn" />
                  <!-- TODO check what is necessary -->
                  <include name="demo/**/*" />
-                 <include name="WEB-INF/lib/hsqldb.jar" />
                  <include name="VAADIN/themes/**/*" />
 +              <include name="VAADIN/vaadinBootstrap.js" />
                  <include name="META-INF/**/*" />
              </fileset>
          </copy>

diff --cc src/com/vaadin/terminal/gwt/client/ui/VWindow.java
Simple merge

diff --cc src/com/vaadin/ui/AbstractComponent.java
Simple merge

diff --cc tests/testbench/com/vaadin/tests/tickets/Ticket20.java
index 348720e030ec7d78b3c082967bc3e1e617341fd1,aa7dcc7c732ba7492e190599992faf8fb6819a51..f6d153ccaa483f81fea6929aa743978e3a7e5416
--- 1/tests/testbench/com/vaadin/tests/tickets/Ticket20.java
--- 2/tests/testbench/com/vaadin/tests/tickets/Ticket20.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java
@@@ -4,12 -4,13 +4,13 @@@ import com.vaadin.Application
  import com.vaadin.data.Validator;
  import com.vaadin.data.util.MethodProperty;
  import com.vaadin.data.validator.CompositeValidator;
+ import com.vaadin.data.validator.CompositeValidator.CombinationMode;
  import com.vaadin.ui.Button;
  import com.vaadin.ui.CheckBox;
 +import com.vaadin.ui.Root;
  import com.vaadin.ui.TextField;
 -import com.vaadin.ui.Window;
  
 -public class Ticket20 extends Application {
 +public class Ticket20 extends Application.LegacyApplication {
  
      @Override
      public void init() {

diff --cc tests/testbench/com/vaadin/tests/validation/TestValidators.java
Simple merge