From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 2 Nov 2011 07:46:49 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git@dev.vaadin.com/vaadin.git
X-Git-Tag: 7.0.0.alpha1~353^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9ead0206fae5e041eb033b0e13a050fd7eb44dea;p=vaadin-framework.git

Merge branch 'master' of ssh://git@dev.vaadin.com/vaadin.git
---

9ead0206fae5e041eb033b0e13a050fd7eb44dea