Fixed up conflict (over white space) in User.php
Fixed up conflict (over white space) in User.php

darcs-hash:20081005181350-7b5ce-1e722af0bd3677b27dd6d100456131a42072dd91.gz

foocorp/gnu-social,UngPirat/freesocial,brion/StatusNet,studio666/gnu-social,furtherfield/gnu-social,brion/StatusNet,xebia/statusnet-oauth2,Br3nda/laconica,shashi/StatusNet,meitar/laconica,meitar/laconica,eXcomm/gnu-social,zh/statusnet,csarven/statusnet,csarven/statusnet,studio666/gnu-social,eXcomm/gnu-social,Piratas/tortuga,UngPirat/freesocial,minmb/statusnet,d3vgru/StatusNet,Piratas/tortuga,Br3nda/laconica,furtherfield/gnu-social,d3vgru/StatusNet,zcopley/StatusNet,shashi/StatusNet,bankonme/gnu-social,Br3nda/laconica,Piratas/tortuga,zh/statusnet,charnimda/lgbtpzn-social,charlycoste/StatusNet,chimo/social,gnusocial/mainline,eXcomm/gnu-social,foocorp/gnu-social,zcopley/StatusNet,gnusocial/mainline,gnusocial/mainline,studio666/gnu-social,sikevux/bsk-social,meitar/laconica,charnimda/lgbtpzn-social,chimo/social,zh/statusnet,znarf/statusnet-ladistribution,faulteh/gnu-social,charnimda/lgbtpzn-social,foocorp/gnu-social,faulteh/gnu-social,xebia/statusnet-oauth2,znarf/statusnet-ladistribution,sikevux/bsk-social,charlycoste/StatusNet,gnusocial/mainline,charlycoste/StatusNet,chimo/social,shashi/StatusNet,UngPirat/freesocial,faulteh/gnu-social,csarven/statusnet,faulteh/gnu-social,znarf/statusnet-ladistribution,zcopley/zcopleys-statusnet-clone,furtherfield/gnu-social,brion/StatusNet,csarven/statusnet,xebia/statusnet-oauth2,zcopley/zcopleys-statusnet-clone,bankonme/gnu-social,studio666/gnu-social,zcopley/zcopleys-statusnet-clone,eXcomm/gnu-social,minmb/statusnet,bankonme/gnu-social,zcopley/StatusNet,d3vgru/StatusNet,sikevux/bsk-social,bankonme/gnu-social,minmb/statusnet,Piratas/tortuga,furtherfield/gnu-social,sikevux/bsk-social