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

Merge branch 'master' into gwt
---

fd80c6937b9eb31de8af83f76ab71d545b8905fc