Merge commit '9ae6c'

author Johannes Dahlström <johannesd@vaadin.com>

Mon, 11 Jun 2012 11:06:15 +0000 (14:06 +0300)

committer Johannes Dahlström <johannesd@vaadin.com>

Mon, 11 Jun 2012 11:06:15 +0000 (14:06 +0300)
author Johannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 11:06:15 +0000 (14:06 +0300)
committer Johannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 11:06:15 +0000 (14:06 +0300)
diff --cc src/com/vaadin/terminal/gwt/client/BrowserInfo.java
Simple merge
author	Johannes Dahlström <johannesd@vaadin.com>
	Mon, 11 Jun 2012 11:06:15 +0000 (14:06 +0300)
committer	Johannes Dahlström <johannesd@vaadin.com>
	Mon, 11 Jun 2012 11:06:15 +0000 (14:06 +0300)