Merge with 6.2

svn changeset:9833/svn branch:portlet_2.0

diff --cc WebContent/WEB-INF/web.xml
Simple merge

diff --cc src/com/vaadin/service/ApplicationContext.java
index 96a6f609063c269bd50b780aa0f691995c3e1ea4,308a936335f4a10b229604de05cfd574321d7286..756a8e50c86798eb271db4c2f15c6c48792d4f3d
--- 1/src/com/vaadin/service/ApplicationContext.java
--- 2/src/com/vaadin/service/ApplicationContext.java
+++ b/src/com/vaadin/service/ApplicationContext.java
@@@ -37,17 -38,16 +39,16 @@@ public interface ApplicationContext ext
      public File getBaseDirectory();
  
      /**
-      * Gets the applications in this context.
+      * Returns a collection of all the applications in this context.
       * 
-      * Gets all applications in this context. Each application context contains
-      * all applications that are open for one user.
+      * Each application context contains all active applications for one user.
       * 
-      * @return Collection containing all applications in this context
+      * @return A collection containing all the applications in this context.
       */
 -    public Collection getApplications();
 -
 +    public Collection<Application> getApplications();
 +    
      /**
-      * Adds transaction listener to this context.
+      * Adds a transaction listener to this context.
       * 
       * @param listener
       *            the listener to be added.

diff --cc src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
Simple merge

diff --cc src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
Simple merge