Merge branch 'master' into layoutgraph

author John Ahlroos <john@vaadin.com>

Wed, 5 Sep 2012 07:55:53 +0000 (10:55 +0300)

committer John Ahlroos <john@vaadin.com>

Wed, 5 Sep 2012 07:55:53 +0000 (10:55 +0300)
author John Ahlroos <john@vaadin.com>
Wed, 5 Sep 2012 07:55:53 +0000 (10:55 +0300)
committer John Ahlroos <john@vaadin.com>
Wed, 5 Sep 2012 07:55:53 +0000 (10:55 +0300)
diff --cc client/src/com/vaadin/client/LayoutManager.java
Simple merge
author	John Ahlroos <john@vaadin.com>
	Wed, 5 Sep 2012 07:55:53 +0000 (10:55 +0300)
committer	John Ahlroos <john@vaadin.com>
	Wed, 5 Sep 2012 07:55:53 +0000 (10:55 +0300)