Merge commit '97df7e'

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

Mon, 11 Jun 2012 10:38:26 +0000 (13:38 +0300)

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

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