merge r2112 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2166 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/pulsecore/autoload.h b/src/pulsecore/autoload.h
index 2899586c61f5dcdcb75fa7dbe321478e289cc944..8a3522a7a8a0dd605c7dfda26dac6c360a04b3fd 100644 (file)
--- a/src/pulsecore/autoload.h
+++ b/src/pulsecore/autoload.h
@@ -37,7 +37,7 @@ typedef struct pa_autoload_entry {
     uint32_t index;
     char *name;
     pa_namereg_type_t type; /* Type of the autoload entry */
-    int in_action; /* Currently loaded */
+    int in_action; /* The module is currently being loaded */
     char *module, *argument;
 } pa_autoload_entry;