From: Artur Signell <artur@vaadin.com>
Date: Fri, 27 Jan 2012 13:00:22 +0000 (+0200)
Subject: Merge branch 'master' into contrib
X-Git-Tag: 7.0.0.alpha2~532
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=abaf86ae9baeae094687cc289990ddeec4979c94;p=vaadin-framework.git

Merge branch 'master' into contrib
---

abaf86ae9baeae094687cc289990ddeec4979c94