From: Artur Signell <artur@vaadin.com>
Date: Tue, 7 Aug 2012 20:15:07 +0000 (+0300)
Subject: Merge commit '197e7ce782968dfda2fd7849547ffdec59a387f5'
X-Git-Tag: 7.0.0.beta1~234^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0a5ef5d891672ddb2b9b4aee1ef195870356520d;p=vaadin-framework.git

Merge commit '197e7ce782968dfda2fd7849547ffdec59a387f5'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/VTextArea.java
---

0a5ef5d891672ddb2b9b4aee1ef195870356520d