Merge changes from origin/7.1

author Build Agent <build@vaadin.com>

Mon, 31 Mar 2014 06:57:14 +0000 (09:57 +0300)

committer Build Agent <build@vaadin.com>

Mon, 31 Mar 2014 06:57:15 +0000 (09:57 +0300)
author Build Agent <build@vaadin.com>
Mon, 31 Mar 2014 06:57:14 +0000 (09:57 +0300)
committer Build Agent <build@vaadin.com>
Mon, 31 Mar 2014 06:57:15 +0000 (09:57 +0300)
diff --cc client/src/com/vaadin/client/ui/VPopupCalendar.java
Simple merge
author	Build Agent <build@vaadin.com>
	Mon, 31 Mar 2014 06:57:14 +0000 (09:57 +0300)
committer	Build Agent <build@vaadin.com>
	Mon, 31 Mar 2014 06:57:15 +0000 (09:57 +0300)