Merged changes from 6.6 to 6.7

author Henri Sara <henri.sara@itmill.com>

Wed, 24 Aug 2011 13:07:30 +0000 (13:07 +0000)

committer Henri Sara <henri.sara@itmill.com>

Wed, 24 Aug 2011 13:07:30 +0000 (13:07 +0000)
author Henri Sara <henri.sara@itmill.com>
Wed, 24 Aug 2011 13:07:30 +0000 (13:07 +0000)
committer Henri Sara <henri.sara@itmill.com>
Wed, 24 Aug 2011 13:07:30 +0000 (13:07 +0000)
diff --cc src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
Simple merge
diff --cc src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
Simple merge
author	Henri Sara <henri.sara@itmill.com>
	Wed, 24 Aug 2011 13:07:30 +0000 (13:07 +0000)
committer	Henri Sara <henri.sara@itmill.com>
	Wed, 24 Aug 2011 13:07:30 +0000 (13:07 +0000)
		1	2
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java	patch \|	diff1 \|	diff2 \|	blob \| history