From: Henri Sara <hesara@vaadin.com>
Date: Tue, 3 Jul 2012 07:37:03 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 7.0.0.beta1~236^2~60
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7dee588cf65799a820dd7c68f5c7dba55e98c8b5;p=vaadin-framework.git

Merge remote-tracking branch 'origin/master'
---

7dee588cf65799a820dd7c68f5c7dba55e98c8b5