Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --cc src/kernel/activity/ActivityImpl.hpp
index 1a28a5f,af36c69..1496c41
--- 1/src/kernel/activity/ActivityImpl.hpp
--- 2/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@@ -35,10 -46,6 +35,11 @@@ namespace activity 
      void ref();
      /** @brief Reduces the refcount */
      void unref();
-     // boost::intrusive_ptr<Activity> support:
++
++     // boost::intrusive_ptr<Activity> support:
 +    friend void intrusive_ptr_add_ref(ActivityImpl * activity);
 +    friend void intrusive_ptr_release(ActivityImpl * activity);
 +
    private:
      std::atomic_int_fast32_t refcount_{1};
    };