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

Merge branch 'master' into gwt
---

b6e69bbb13614062752528580df13b19144e25ee