Merge branch 'v3_9_x'

diff --combined ChangeLog
index be7e415,f6ccfdc..8cca5bc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,3 +1,18 @@@
 +SimGrid (3.10) NOT RELEASED; urgency=low
 +
 + XBT:
 + * Our own implementation of getline is renamed xbt_getline, and gets
 +   used even if the OS provide a getline(). This should reduce the
 +   configuration complexity by using the same code on all platforms.
 +
 + Java:
 + * Reintegrate Java to the main archive as desynchronizing these
 +   package is not acceptable anymore (Java is now considered stable)
 + * Bugfix: Task.setDataSize() only changed the C world, not the value
 +   cached in the Java world
 +
 +-- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 +
  SimGrid (3.9) stable; urgency=low
  
   The Grasgory release: GRAS is really dead now.
@@@ -87,7 -72,7 +87,7 @@@
   TRACING:
   * Transfer the tracing files into the corresponding modules.
  
-  -- Tue Jan 29 19:38:56 CET 2013 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+  -- Tue Feb 5 11:31:43 CET 2013 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
  
  SimGrid (3.8.1) stable; urgency=low
  

diff --combined NEWS
index 1f8b413,3dc553a..b4ddce2
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,22 -1,16 +1,22 @@@
 +                    _               _____  _  ___
 +__   _____ _ __ ___(_) ___  _ __   |___ / / |/ _ \
 +\ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | | | | |
 + \ V /  __/ |  \__ \ | (_) | | | |  ___) || | |_| |
 +  \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_|\___/
 +
 +(to complete)
                      _               _____ ___
  __   _____ _ __ ___(_) ___  _ __   |___ // _ \
  \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ (_) |
   \ V /  __/ |  \__ \ | (_) | | | |  ___) \__, |
    \_/ \___|_|  |___/_|\___/|_| |_| |____(_)/_/
-                 Jan 29 2013
+                 Feb 5 2013
  
  The "Grasgory" release. Major changes:
  
   * Gras was completely removed from this version.
   * Documentation reorganization to ease browsing it.
   * New default value for the TCP_gamma parameter: 4MiB
 -
                      _               _____  ___   _
  __   _____ _ __ ___(_) ___  _ __   |___ / ( _ ) / |
  \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ / _ \ | |

diff --combined include/xbt/dynar.h
index 1e710f4,4f89ad1..d706778
--- 1/include/xbt/dynar.h
--- 2/include/xbt/dynar.h
+++ b/include/xbt/dynar.h
@@@ -92,9 -92,6 +92,9 @@@ XBT_PUBLIC(void) xbt_dynar_insert_at(xb
                                       const int idx, const void *src);
  XBT_PUBLIC(void) xbt_dynar_remove_at(xbt_dynar_t const dynar,
                                       const int idx, void *const dst);
 +XBT_PUBLIC(void) xbt_dynar_remove_n_at(xbt_dynar_t const dynar,
 +                                     const unsigned int n, const int idx);
 +
  
  XBT_PUBLIC(unsigned int) xbt_dynar_search(xbt_dynar_t const dynar, void *elem);
  XBT_PUBLIC(signed int) xbt_dynar_search_or_negative(xbt_dynar_t const dynar, void *const elem);
@@@ -230,7 -227,7 +230,7 @@@ typedef struct xbt_dynar_s 
  } s_xbt_dynar_t;
  
  static XBT_INLINE void
- _xbt_dynar_cursor_first(const xbt_dynar_t dynar,
+ _xbt_dynar_cursor_first(const xbt_dynar_t dynar _XBT_GNUC_UNUSED,
                          unsigned int *const cursor)
  {
    /* iterating over a NULL dynar is a no-op (but we don't want to have uninitialized counters) */