Merge branch 'master' into dojo_160
diff --git a/bundles/org.eclipse.orion.client.core/static/js/coding/coding.js b/bundles/org.eclipse.orion.client.core/static/js/coding/coding.js
index e2be8ac..193722f 100644
--- a/bundles/org.eclipse.orion.client.core/static/js/coding/coding.js
+++ b/bundles/org.eclipse.orion.client.core/static/js/coding/coding.js
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2010, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * All rights reserved. This program and the accompanying materials are made 
+ * available under the terms of the Eclipse Public License v1.0 
+ * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
+ * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.orion.client.core/static/js/compare/demo/demo-data.js b/bundles/org.eclipse.orion.client.core/static/js/compare/demo/demo-data.js
index 6d55e09..7018942 100644
--- a/bundles/org.eclipse.orion.client.core/static/js/compare/demo/demo-data.js
+++ b/bundles/org.eclipse.orion.client.core/static/js/compare/demo/demo-data.js
@@ -1,8 +1,9 @@
 /*******************************************************************************

  * Copyright (c) 2011 IBM Corporation and others. All rights reserved. This

- * program and the accompanying materials are made available under the terms of

- * the Eclipse Public License v1.0 which accompanies this distribution, and is

- * available at http://www.eclipse.org/legal/epl-v10.html

+ * All rights reserved. This program and the accompanying materials are made 

+ * available under the terms of the Eclipse Public License v1.0 

+ * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 

+ * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 

  * 

  * Contributors: IBM Corporation - initial API and implementation

  ******************************************************************************/