Merge branch 'primary-stylename' into sass

author Marc Englund <marc@vaadin.com>

Mon, 1 Oct 2012 08:30:59 +0000 (11:30 +0300)

committer Marc Englund <marc@vaadin.com>

Mon, 1 Oct 2012 08:30:59 +0000 (11:30 +0300)
author Marc Englund <marc@vaadin.com>
Mon, 1 Oct 2012 08:30:59 +0000 (11:30 +0300)
committer Marc Englund <marc@vaadin.com>
Mon, 1 Oct 2012 08:30:59 +0000 (11:30 +0300)
diff --cc server/src/com/vaadin/ui/AbstractComponent.java
Simple merge
author	Marc Englund <marc@vaadin.com>
	Mon, 1 Oct 2012 08:30:59 +0000 (11:30 +0300)
committer	Marc Englund <marc@vaadin.com>
	Mon, 1 Oct 2012 08:30:59 +0000 (11:30 +0300)