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

Merge branch 'master' into gwt
---

59f1cea4acbee1350757e6ffe4e5da9b983db9e5