--- 1463624-32-move-password-inc-to-dic.patch	2012-11-13 22:09:49.000000000 +0100
+++ 1463624-34-move-password-inc-to-dic.patch	2012-11-14 09:49:24.000000000 +0100
@@ -311,21 +311,22 @@
      // needs to be set on the matcher using a different method, so we use a
 diff --git a/core/lib/Drupal/Core/Password/PasswordInterface.php b/core/lib/Drupal/Core/Password/PasswordInterface.php
 new file mode 100644
-index 0000000..8d31b0d
+index 0000000..89f1806
 --- /dev/null
 +++ b/core/lib/Drupal/Core/Password/PasswordInterface.php
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,63 @@
 +<?php
 +
 +/**
 + * @file
-+ * Definition of Drupal\Core\Password\PasswordInterface.
-+ *
-+ * Secure password hashing functions for user authentication.
++ * Definition of Drupal\Core\Password\PasswordInterface
 + */
 +
 +namespace Drupal\Core\Password;
 +
++/**
++ * Secure password hashing functions for user authentication.
++ */
 +interface PasswordInterface {
 +
 +  /**
@@ -379,23 +380,24 @@
 +}
 diff --git a/core/lib/Drupal/Core/Password/PhpassFactory.php b/core/lib/Drupal/Core/Password/PhpassFactory.php
 new file mode 100644
-index 0000000..f92c423
+index 0000000..b52de56
 --- /dev/null
 +++ b/core/lib/Drupal/Core/Password/PhpassFactory.php
-@@ -0,0 +1,27 @@
+@@ -0,0 +1,28 @@
 +<?php
 +
 +/**
 + * @file
-+ * Definition of Drupal\Core\Password\PhpassFactory.
-+ *
-+ * Instantiate phpass password hashing algorithm with the parameters given in
-+ * the system.password config.
++ * Definition of Drupal\Core\Password\PhpassFactory
 + */
 +
 +namespace Drupal\Core\Password;
 +use Drupal\Core\Password\PhpassHashedPassword;
 +
++/**
++ * Instantiate phpass password hashing algorithm with the parameters given in
++ * the system.password config.
++ */
 +class PhpassFactory {
 +
 +  /**
@@ -412,22 +414,25 @@
 +}
 diff --git a/core/lib/Drupal/Core/Password/PhpassHashedPassword.php b/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
 new file mode 100644
-index 0000000..549bfbe
+index 0000000..d5ae542
 --- /dev/null
 +++ b/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
-@@ -0,0 +1,256 @@
+@@ -0,0 +1,259 @@
 +<?php
 +
 +/**
 + * @file
-+ * Definition of Drupal\Core\Password\PhpassHashedPassword.
-+ *
-+ * Based on the Portable PHP password hashing framework.
-+ * @see http://www.openwall.com/phpass/
++ * Definition of Drupal\Core\Password\PhpassHashedPassword
 + */
 +
 +namespace Drupal\Core\Password;
 +
++/**
++ * Secure password hashing functions based on the Portable PHP password
++ * hashing framework.
++ *
++ * @see http://www.openwall.com/phpass/
++ */
 +class PhpassHashedPassword implements PasswordInterface {
 +  /**
 +   * The minimum allowed log2 number of iterations for password stretching.