Index: example.drushrc.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/example.drushrc.php,v
retrieving revision 1.16
diff -u -r1.16 example.drushrc.php
--- example.drushrc.php	21 Nov 2009 02:24:53 -0000	1.16
+++ example.drushrc.php	30 Nov 2009 00:50:07 -0000
@@ -8,6 +8,7 @@
  * Rename this file to drushrc.php and optionally copy it to one of
  * five convenient places, listed below in order of precedence:
  *
+ * - The current working directory
  * - Drupal site folder (e.g sites/{default|example.com}/drushrc.php).
  * - Drupal installation root.
  * - User Home folder (i.e. ~/.drushrc.php).
Index: includes/context.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/context.inc,v
retrieving revision 1.13
diff -u -r1.13 context.inc
--- includes/context.inc	21 Nov 2009 02:24:53 -0000	1.13
+++ includes/context.inc	30 Nov 2009 00:50:08 -0000
@@ -46,6 +46,7 @@
  *
  *    Specified by config files : 
  *      custom   : Loaded from the config file specified by --config or -c
+ *      cwd      : Loaded from the drushrc.php file in the current working directory.
  *      site     : Loaded from the drushrc.php file in the Drupal site directory.
  *      drupal   : Loaded from the drushrc.php file in the Drupal root directory.
  *      user     : Loaded from the drushrc.php file in the user's home directory.
@@ -76,6 +77,9 @@
     $configs['custom'] = $config;
   }
 
+  // in the current working directory
+  $configs['cwd'] = drush_cwd() . '/drushrc.php';
+
   if ($site_path = drush_get_context('DRUSH_DRUPAL_SITE_ROOT')) {
     $configs['site'] = $site_path . "/drushrc.php";
   }
@@ -116,6 +120,7 @@
   $config = _drush_config_file($context);
   if (file_exists($config)) {
     drush_log(dt('Loading drushrc "!config" into "!context" scope.', array('!config' => realpath($config), '!context' => $context)), 'bootstrap');
+    $options = array();
     require_once($config);
     
     // If site aliases are defined in multiple drush configuration files,
@@ -287,7 +292,7 @@
     // We are not checking a specific context, so check them in a predefined order of precedence.
     static $contexts = array(
       'process', 'options', 'stdin', 'alias',
-      'custom', 'site', 'drupal', 'user', 'system', 
+      'custom', 'cwd', 'site', 'drupal', 'user', 'system', 
       'drush', 'default');
 
     foreach ($contexts as $context) {
@@ -312,7 +317,7 @@
 function drush_get_merged_options() {
   static $contexts = array(
       'process', 'options', 'stdin', 'alias', 
-      'custom', 'site', 'drupal', 'user', 'system',
+      'custom', 'cwd', 'site', 'drupal', 'user', 'system',
       'drush', 'default');
   $cache = drush_get_context();
   $result = array();
Index: includes/environment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/environment.inc,v
retrieving revision 1.53
diff -u -r1.53 environment.inc
--- includes/environment.inc	28 Nov 2009 00:49:01 -0000	1.53
+++ includes/environment.inc	30 Nov 2009 00:50:08 -0000
@@ -401,6 +401,9 @@
   // Load a drushrc.php file in the ~/.drush directory.
   drush_load_config('user');
 
+  // Load a drushrc.php file in the current working directory.
+  drush_load_config('cwd'); 
+
   // Process the site alias that specifies which instance
   // of drush (local or remote) this command will operate on.
   // We must do this after we load our config files (so that