Error I made merging a diff
Error I made merging a diff

darcs-hash:20080712123942-533db-21fa41076dd7b57935f49462423f247ccbb01e8f.gz

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