[drupal(DRUPAL-4-7):killes] /includes session.inc /modules user.module

[drupal-cvs at drupal.org]

User: killes	Branch: DRUPAL-4-7	Date: Mon, 01 Jan 2007 18:25:17 +0000

Modified files:
  /includes session.inc
  /modules user.module

Log message:
  #87372, duplicate session cookies prevent login, backport

Links:
  http://cvs.drupal.org/diff.php?path=drupal/includes/session.inc&old=1.27.2.1&new=1.27.2.2&root=contrib
  http://cvs.drupal.org/diff.php?path=drupal/modules/user.module&old=1.612.2.25&new=1.612.2.26&root=contrib