Index: drupal_queue.drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupal_queue/drupal_queue.drush.inc,v
retrieving revision 1.4
diff -u -p -r1.4 drupal_queue.drush.inc
--- drupal_queue.drush.inc	4 May 2010 21:15:42 -0000	1.4
+++ drupal_queue.drush.inc	24 Aug 2010 15:38:09 -0000
@@ -27,16 +27,3 @@ function drupal_queue_drush_command() {
   );
   return $items;
 }
-
-/**
- * Run the drupal_queue cron code before normal drush cron is run.
- *
- * This needs to run before the normal drupal cron, because the normal
- * drupal cron will exit with an error if it is already running, but
- * the Drupal_Queue cron does not have this limitation.
- */
-function drush_drupal_queue_pre_core_cron() {
-  if (function_exists('drupal_queue_cron_run') && variable_get('drupal_queue_on_cron', TRUE)) {
-    drupal_queue_cron_run();
-  }
-}
Index: drupal_queue.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupal_queue/drupal_queue.module,v
retrieving revision 1.4
diff -u -p -r1.4 drupal_queue.module
--- drupal_queue.module	4 May 2010 20:48:19 -0000	1.4
+++ drupal_queue.module	24 Aug 2010 15:38:09 -0000
@@ -61,9 +61,13 @@ function drupal_queue_cron_run() {
 }
 
 /**
- * Implementation of hook_cron();
+ * Implementation of hook_cron().
  */
 function drupal_queue_cron() {
+  if (variable_get('drupal_queue_on_cron', TRUE)) {
+    drupal_queue_cron_run();
+  }
+
   // Reset expired items in the default queue implementation table. If that's
   // not used, this will simply be a no-op (see D7 system_cron())
   db_query('UPDATE {queue} SET expire = 0 WHERE expire < %d', time());