Merge branch 'stable'

Conflicts:
	docs/rabbitmq.config.example

Author: michaelklishin

docs/rabbitmq.config.example

@@ -318,15 +318,15 @@
    %%
    %% {hipe_compile, true},
 
-   %% Timeout used when waiting for Mnesia tables in a cluster to
+   %% Number of times to retry while waiting for Mnesia tables in a cluster to
    %% become available.
    %%
-   %% {mnesia_table_loading_retry_timeout, 30000},
+   %% {mnesia_table_loading_retry_limit, 10},
 
-   %% Retries when waiting for Mnesia tables in the cluster startup. Note that
-   %% this setting is not applied to Mnesia upgrades or node deletions.
+   %% Time to wait per retry for Mnesia tables in a cluster to become
+   %% available.
    %%
-   %% {mnesia_table_loading_retry_limit, 10},
+   %% {mnesia_table_loading_retry_timeout, 30000},
 
    %% Size in bytes below which to embed messages in the queue index. See
    %% http://www.rabbitmq.com/persistence-conf.html