Merge remote-tracking branch 'origin/master'

author John Ahlroos <john@vaadin.com>

Mon, 10 Sep 2012 09:34:31 +0000 (12:34 +0300)

committer John Ahlroos <john@vaadin.com>

Mon, 10 Sep 2012 09:34:31 +0000 (12:34 +0300)
author John Ahlroos <john@vaadin.com>
Mon, 10 Sep 2012 09:34:31 +0000 (12:34 +0300)
committer John Ahlroos <john@vaadin.com>
Mon, 10 Sep 2012 09:34:31 +0000 (12:34 +0300)
diff --cc server/src/com/vaadin/ui/AbstractField.java
Simple merge
author	John Ahlroos <john@vaadin.com>
	Mon, 10 Sep 2012 09:34:31 +0000 (12:34 +0300)
committer	John Ahlroos <john@vaadin.com>
	Mon, 10 Sep 2012 09:34:31 +0000 (12:34 +0300)