fixup conflicts
fixup conflicts

darcs-hash:20080706221758-84dde-5e222a282f9a1bd242d2653700c444e93e21cc7f.gz

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