From: Henri Sara <hesara@vaadin.com>
Date: Fri, 29 Jun 2012 12:26:32 +0000 (+0300)
Subject: Merge branch 'master' into gwt
X-Git-Tag: 7.0.0.beta1~236^2~62^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=832bd0247a86a5dbfc4eed421d217db88bdd315f;p=vaadin-framework.git

Merge branch 'master' into gwt
---

832bd0247a86a5dbfc4eed421d217db88bdd315f