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

diff --cc buildtools/Cmake/DefinePackages.cmake
Simple merge

diff --cc examples/java/io/Node.java
Simple merge

diff --cc include/msg/msg.h
index ccf0783,da997a2..920a80c
--- 1/include/msg/msg.h
--- 2/include/msg/msg.h
+++ b/include/msg/msg.h
@@@ -69,19 -69,10 +69,17 @@@ XBT_PUBLIC(void) MSG_set_function(cons
  XBT_PUBLIC(double) MSG_get_clock(void);
  XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(void);
  
 +/************************** Environment ***********************************/
 +XBT_PUBLIC(msg_as_t) MSG_environment_get_routing_root(void);
 +XBT_PUBLIC(const char *) MSG_environment_as_get_name(msg_as_t as);
 +XBT_PUBLIC(xbt_dict_t) MSG_environment_as_get_routing_sons(msg_as_t as);
 +XBT_PUBLIC(const char *) MSG_environment_as_get_property_value(msg_as_t as, const char *name);
 +XBT_PUBLIC(const char *) MSG_environment_as_get_model(msg_as_t as);
 +XBT_PUBLIC(xbt_dynar_t) MSG_environment_as_get_hosts(msg_as_t as);
  
  /************************** File handling ***********************************/
- XBT_PUBLIC(size_t) MSG_file_read(void* ptr, size_t size, size_t nmemb,
-                                  msg_file_t fd);
- XBT_PUBLIC(size_t) MSG_file_write(const void* ptr, size_t size, size_t nmemb,
-                                   msg_file_t fd);
+ XBT_PUBLIC(size_t) MSG_file_read(void* ptr, size_t size, msg_file_t fd);
+ XBT_PUBLIC(size_t) MSG_file_write(const void* ptr, size_t size, msg_file_t fd);
  XBT_PUBLIC(msg_file_t) MSG_file_open(const char* mount, const char* path);
  XBT_PUBLIC(int) MSG_file_close(msg_file_t fd);
  XBT_PUBLIC(size_t) MSG_file_get_size(msg_file_t fd);

diff --cc src/include/surf/surf.h
Simple merge