From: Leif Åstrand <leif@vaadin.com>
Date: Fri, 6 Jan 2012 12:42:48 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into contrib
X-Git-Tag: 7.0.0.alpha2~541
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=838d3f7120ae41b84a8894f7cab64ee09f3c74e4;p=vaadin-framework.git

Merge remote branch 'origin/master' into contrib
---

838d3f7120ae41b84a8894f7cab64ee09f3c74e4