Merge lp:~linuxjedi/drizzle/elliott-bug-654568 into lp:drizzle/7.0

[Andrew Hutchings]

=== modified file 'config/pandora-plugin'
--- config/pandora-plugin	2010-09-26 20:56:46 +0000
+++ config/pandora-plugin	2010-10-04 15:26:16 +0000
@@ -238,8 +238,8 @@
   ])
 AC_ARG_ENABLE([%(name_with_dashes)s-plugin],[
 dnl indented wierd to make the help output correct
-AS_HELP_STRING([--enable-%(name_with_dashes)s-plugin],[Build %(title)s. @<:@default=%(default_yesno)s@:>@])
-AS_HELP_STRING([--disable-%(name_with_dashes)s-plugin],[Disable building %(title)s])
+AS_HELP_STRING([--enable-%(name_with_dashes)s-plugin],[Enable loading %(title)s by default. @<:@default=%(default_yesno)s@:>@])
+AS_HELP_STRING([--disable-%(name_with_dashes)s-plugin],[Disable loading %(title)s by default.])
   ],
   [enable_%(name)s_plugin="$enableval"],
   [enable_%(name)s_plugin=%(default_yesno)s])