From: Jens Jansson <peppe@vaadin.com>
Date: Thu, 22 Dec 2011 10:30:38 +0000 (+0200)
Subject: Merge commit 'b9b1de7779dcb1d85778b056f5d017acd9d3c5a9' into contrib
X-Git-Tag: 7.0.0.alpha2~545^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a2cc4e7a0525c44dbcb5cd0f79dbf6b31a61de64;p=vaadin-framework.git

Merge commit 'b9b1de7779dcb1d85778b056f5d017acd9d3c5a9' into contrib

Conflicts:
	src/com/vaadin/data/util/converter/Converter.java
	src/com/vaadin/ui/AbsoluteLayout.java
---

a2cc4e7a0525c44dbcb5cd0f79dbf6b31a61de64