Merge branch 'dbupgrade-for-auth'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 30 Dec 2010 14:06:24 +0000 (15:06 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 30 Dec 2010 14:06:24 +0000 (15:06 +0100)

Trivial merge