From: Jens Jansson <peppe@vaadin.com>
Date: Thu, 26 Jan 2012 12:36:16 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into contrib
X-Git-Tag: 7.0.0.alpha2~535
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=efeb6788645ad33075bb1d29c246f2c3cf717ab0;p=vaadin-framework.git

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

efeb6788645ad33075bb1d29c246f2c3cf717ab0