Merge branch 'master' into layoutgraph

author John Ahlroos <john@vaadin.com>

Wed, 29 Aug 2012 06:15:02 +0000 (09:15 +0300)

committer John Ahlroos <john@vaadin.com>

Wed, 29 Aug 2012 06:15:02 +0000 (09:15 +0300)
author John Ahlroos <john@vaadin.com>
Wed, 29 Aug 2012 06:15:02 +0000 (09:15 +0300)
committer John Ahlroos <john@vaadin.com>
Wed, 29 Aug 2012 06:15:02 +0000 (09:15 +0300)
diff --cc client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java
Simple merge
diff --cc client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
Simple merge
diff --cc client/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java
Simple merge
diff --cc shared/src/com/vaadin/shared/ComponentState.java
Simple merge
author	John Ahlroos <john@vaadin.com>
	Wed, 29 Aug 2012 06:15:02 +0000 (09:15 +0300)
committer	John Ahlroos <john@vaadin.com>
	Wed, 29 Aug 2012 06:15:02 +0000 (09:15 +0300)
		1	2
client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java	patch \|	diff1 \|	diff2 \|	blob \| history
client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java	patch \|	diff1 \|	diff2 \|	blob \| history
client/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java	patch \|	diff1 \|	diff2 \|	blob \| history
shared/src/com/vaadin/shared/ComponentState.java	patch \|	diff1 \|	diff2 \|	blob \| history