Merge remote branch 'origin/6.8'

author Leif Åstrand <leif@vaadin.com>

Thu, 1 Dec 2011 13:20:57 +0000 (15:20 +0200)

committer Leif Åstrand <leif@vaadin.com>

Thu, 1 Dec 2011 13:20:57 +0000 (15:20 +0200)
author Leif Åstrand <leif@vaadin.com>
Thu, 1 Dec 2011 13:20:57 +0000 (15:20 +0200)
committer Leif Åstrand <leif@vaadin.com>
Thu, 1 Dec 2011 13:20:57 +0000 (15:20 +0200)
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
author	Leif Åstrand <leif@vaadin.com>
	Thu, 1 Dec 2011 13:20:57 +0000 (15:20 +0200)
committer	Leif Åstrand <leif@vaadin.com>
	Thu, 1 Dec 2011 13:20:57 +0000 (15:20 +0200)
		1	2
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/VWindow.java	patch \|	diff1 \|	diff2 \|	blob \| history