--- a/app/soc/models/user.py	Thu Sep 11 21:30:08 2008 +0000
+++ b/app/soc/models/user.py	Fri Sep 12 02:12:38 2008 +0000
@@ -25,7 +25,9 @@
 
 import logging
 
+from google.appengine.api import users
 from google.appengine.ext import db
+
 from django.utils.translation import ugettext_lazy
 
 from soc.models import base
@@ -57,6 +59,10 @@
   #: of any Melange application.
   id = db.UserProperty(required=True)
 
+  #: A list (possibly empty) of former Google Accounts associated with
+  #: this User.
+  former_ids = db.ListProperty(users.User)
+
   #: Required field storing a nickname; displayed publicly.
   #: Nicknames can be any valid UTF-8 text.
   nick_name = db.StringProperty(required=True,