Index: skinr.api.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/skinr.api.php,v
retrieving revision 1.2
diff -u -p -r1.2 skinr.api.php
--- skinr.api.php	10 Jan 2011 04:11:12 -0000	1.2
+++ skinr.api.php	14 Jan 2011 02:45:16 -0000
@@ -268,7 +268,7 @@ function hook_skinr_skin_info() {
  * For example, considering a module or theme with the name "extension" that
  * contains an include file:
  * @code
- * extension/skins/example.inc
+ * extension/skins/example/example.inc
  * @encode
  * The "hook" prefix is substituted with the name of the module or theme
  * implementing it ("extension"), and PLUGIN is substituted with the name of the
@@ -354,7 +354,7 @@ function hook_skinr_group_info() {
  * For example, considering a module or theme with the name "extension" that
  * contains an include file:
  * @code
- * extension/skins/example.inc
+ * extension/skins/example/example.inc
  * @encode
  * The "hook" prefix is substituted with the name of the module or theme
  * implementing it ("extension"), and PLUGIN is substituted with the name of the
Index: skinr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/skinr.module,v
retrieving revision 1.38
diff -u -p -r1.38 skinr.module
--- skinr.module	13 Jan 2011 06:46:54 -0000	1.38
+++ skinr.module	14 Jan 2011 02:50:17 -0000
@@ -559,7 +559,8 @@ function skinr_load_plugins($extension) 
     $mask = '@^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.inc$@';
     $loaded[$extension['name']] = file_scan_directory($dir, $mask, array(
       'key' => 'name',
-      'recurse' => FALSE,
+      'recurse' => TRUE,
+      'min_depth' => 1,
       'callback' => 'skinr_include_once',
     ));
   }
Index: tests/skinr.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/tests/skinr.test,v
retrieving revision 1.6
diff -u -p -r1.6 skinr.test
--- tests/skinr.test	14 Jan 2011 01:08:49 -0000	1.6
+++ tests/skinr.test	14 Jan 2011 02:55:10 -0000
@@ -177,10 +177,12 @@ class SkinrApiTestCase extends DrupalWeb
 
     // Skinr's own implementation in skinr.skinr.inc should always be found.
     $this->assertTrue(isset($config['rules']), 'hook_skinr_config_info() in $module.skinr.inc found.');
+    unset($config['rules']);
 
     // Skinr's implementation on behalf of Node module in modules/node.skinr.inc
     // should be found.
     $this->assertTrue(isset($config['node']), 'hook_skinr_config_info() in a custom path found.');
+    unset($config['node']);
 
     // Ensure that skinr_test_incompatible is not contained.
     $this->assertTrue(!isset($config['skinr_test_incompatible']), 'Incompatible hook_skinr_config_info() not found.');
Index: tests/skins/example.inc
===================================================================
RCS file: tests/skins/example.inc
diff -N tests/skins/example.inc
--- tests/skins/example.inc	11 Jan 2011 00:54:20 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-<?php
-// $Id$
-
-/**
- * Implements hook_skinr_skin_PLUGIN_info().
- */
-function skinr_test_skinr_skin_example_info() {
-  $skins['skinr_test_example'] = array(
-    'title' => t('Example skin plugin'),
-  );
-  return $skins;
-}
Index: tests/skins/example/example.inc
===================================================================
RCS file: tests/skins/example/example.inc
diff -N tests/skins/example/example.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/skins/example/example.inc	11 Jan 2011 00:54:20 -0000
@@ -0,0 +1,12 @@
+<?php
+// $Id$
+
+/**
+ * Implements hook_skinr_skin_PLUGIN_info().
+ */
+function skinr_test_skinr_skin_example_info() {
+  $skins['skinr_test_example'] = array(
+    'title' => t('Example skin plugin'),
+  );
+  return $skins;
+}