Merge commit '0b46687ab0cedb3523321854b52d988dae18452a' from origin/6.8

author Artur Signell <artur@vaadin.com>

Fri, 23 Mar 2012 06:29:38 +0000 (08:29 +0200)

committer Artur Signell <artur@vaadin.com>

Fri, 23 Mar 2012 06:29:38 +0000 (08:29 +0200)
author Artur Signell <artur@vaadin.com>
Fri, 23 Mar 2012 06:29:38 +0000 (08:29 +0200)
committer Artur Signell <artur@vaadin.com>
Fri, 23 Mar 2012 06:29:38 +0000 (08:29 +0200)
diff --cc WebContent/VAADIN/themes/reindeer/panel/panel.css
Simple merge
diff --cc src/com/vaadin/terminal/gwt/client/ui/VButton.java
Simple merge
author	Artur Signell <artur@vaadin.com>
	Fri, 23 Mar 2012 06:29:38 +0000 (08:29 +0200)
committer	Artur Signell <artur@vaadin.com>
	Fri, 23 Mar 2012 06:29:38 +0000 (08:29 +0200)
		1	2
WebContent/VAADIN/themes/reindeer/panel/panel.css	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/vaadin/terminal/gwt/client/ui/VButton.java	patch \|	diff1 \|	diff2 \|	blob \| history