From: Henri Sara <hesara@vaadin.com>
Date: Fri, 16 Mar 2012 11:47:54 +0000 (+0200)
Subject: Merge branch 'master' into hierarchypaint
X-Git-Tag: 7.0.0.alpha2~300
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ce567aa6cb985bf1ed678ea24a48ebe7f6442d17;p=vaadin-framework.git

Merge branch 'master' into hierarchypaint
---

ce567aa6cb985bf1ed678ea24a48ebe7f6442d17