From: Artur Signell <artur@vaadin.com>
Date: Fri, 23 Mar 2012 06:54:03 +0000 (+0200)
Subject: Merge commit 'd075d778b41a299d9b47d4b78ebf9e639d0f732a'
X-Git-Tag: 7.0.0.alpha2~236
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=35b35a83f742c12c3080ca774dbf15f72ab12dfe;p=vaadin-framework.git

Merge commit 'd075d778b41a299d9b47d4b78ebf9e639d0f732a'

Conflicts:
	src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
---

35b35a83f742c12c3080ca774dbf15f72ab12dfe