From: Henri Sara <hesara@vaadin.com>
Date: Tue, 31 Jan 2012 14:42:09 +0000 (+0200)
Subject: Merge branch 'master' into rpc
X-Git-Tag: 7.0.0.alpha2~440^2~26
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dc0268c218c9de44df30f816d541de279e529ef4;p=vaadin-framework.git

Merge branch 'master' into rpc

Conflicts:
	build/build.xml
	src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
	src/com/vaadin/terminal/gwt/client/Container.java
	src/com/vaadin/terminal/gwt/client/VPaintableWidget.java
	src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
	src/com/vaadin/terminal/gwt/client/ui/VButton.java
	src/com/vaadin/terminal/gwt/client/ui/VButtonPaintable.java
	src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
	src/com/vaadin/terminal/gwt/client/ui/VNativeButtonPaintable.java
	src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
	src/com/vaadin/terminal/gwt/client/ui/VSlider.java
	src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
	src/com/vaadin/terminal/gwt/client/ui/VUpload.java
	src/com/vaadin/terminal/gwt/client/ui/VWindow.java
	src/com/vaadin/ui/Button.java
	tests/server-side/com/vaadin/tests/VaadinClasses.java
---

dc0268c218c9de44df30f816d541de279e529ef4