Merge "next" branch into "master".

diff --cc lib/svec.h
Simple merge

diff --cc lib/unixctl.h
index 24a9d8c,0b6cbf3..89199bb
--- 1/lib/unixctl.h
--- 2/lib/unixctl.h
+++ b/lib/unixctl.h
@@@ -39,14 -35,11 +39,15 @@@ const char *unixctl_client_target(cons
  
  /* Command registration. */
  struct unixctl_conn;
+ typedef void unixctl_cb_func(struct unixctl_conn *,
+                              const char *args, void *aux);
  void unixctl_command_register(const char *name,
-                               void (*cb)(struct unixctl_conn *,
-                                          const char *args));
+                               unixctl_cb_func *cb, void *aux);
  void unixctl_command_reply(struct unixctl_conn *, int code,
                             const char *body);
 + 
 +#ifdef  __cplusplus
 +}
 +#endif
  
  #endif /* unixctl.h */