Merge branch 'master' into root-cleanup

Conflicts:
	server/src/com/vaadin/terminal/DeploymentConfiguration.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java

1 files changed, 33 insertions, 0 deletions

diff --git a/server/src/com/vaadin/ui/NativeButton.java b/server/src/com/vaadin/ui/NativeButton.java
new file mode 100644
index 0000000000..d5d669bb9b
--- /dev/null
+++ b/server/src/com/vaadin/ui/NativeButton.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.ui;
+
+@SuppressWarnings("serial")
+public class NativeButton extends Button {
+
+    public NativeButton() {
+        super();
+    }
+
+    public NativeButton(String caption) {
+        super(caption);
+    }
+
+    public NativeButton(String caption, ClickListener listener) {
+        super(caption, listener);
+    }
+
+}