Release Preparation - Update changelog
Cosmetic fix

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@933987 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/composite/doc/changelog.txt b/ipojo/composite/doc/changelog.txt
index 043835e..765d424 100644
--- a/ipojo/composite/doc/changelog.txt
+++ b/ipojo/composite/doc/changelog.txt
@@ -1,3 +1,10 @@
+Changes from the 1.4.0 to 1.6.0

+-------------------------------

+** Improvement

+    * [FELIX-1427] - Service injection with Smart Proxies

+    * [FELIX-1906] - Allow calling a method when service properties of an already injected service are modified

+

+    

 Changes from 1.2.0 to 1.4.0

 ---------------------------

 ** Bug

diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java b/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java
index 5ee663a..bb0b14f 100644
--- a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java
+++ b/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java
@@ -134,8 +134,8 @@
                 .registerService(getSpecification().getName(), svc, getProps(reference));

             m_registrations.put(reference, reg);

         } else {

-            throw new SecurityException("The bundle " + m_destination.getBundle().getBundleId() + " does not have the " +

-                    "permission to register the service " + getSpecification().getName());

+            throw new SecurityException("The bundle " + m_destination.getBundle().getBundleId() + " does not have the "

+                    + "permission to register the service " + getSpecification().getName());

         }

     }