Merge remote-tracking branch 'origin/6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
	tests/test.xml

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

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

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

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

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

diff --cc tests/integration_tests.xml
Simple merge

diff --cc tests/test.xml
index 9d060c9a29e57edb4445cbdd488198ce976d79c1,5322215c6d8857cf36c350cce4d18985c83e3c62..2baa26218af5944939d7cef7eff3733ecb9974ea
--- 1/tests/test.xml
--- 2/tests/test.xml
+++ b/tests/test.xml
@@@ -11,7 -5,7 +11,7 @@@
        <!-- Configuration                                                      -->
        <!-- ================================================================== -->
        <!-- Browsers to use for testing -->
-       <property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox9,winxp-safari5,winxp-googlechrome-stable,winxp-opera11" />
 -      <property name="browsers-windows" value="winxp-ie6,winxp-ie7,winxp-ie8,win7-ie9,winxp-firefox36,winxp-firefox10,winxp-safari4,winxp-safari5,winxp-googlechrome13,winxp-googlechrome-stable,winxp-opera1060,winxp-opera11" />
++      <property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox10,winxp-safari5,winxp-googlechrome-stable,winxp-opera11" />
        <property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" />
        <property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />