Squashed commit of the following:
Squashed commit of the following:

commit 2b9bce9ef8f6cf55b7ac62231bcc0173260ba472
Merge: 3ba4f24 12b680e
Author: Evan Prodromou <evan@status.net>
Date:   Mon Aug 13 14:31:46 2012 -0400

    Merge commit 'refs/merge-requests/207' of git://gitorious.org/statusnet/mainline into merge-requests/207

commit 12b680e375db9de01cac77dd9a71adb729292dc7
Author: Mikael Nordfeldth <mmn@hethane.se>
Date:   Fri Aug 10 20:49:52 2012 +0200

    testing whether $user is predefined before otherwise setting it to common_current_user()

bankonme/gnu-social,chimo/social,charnimda/lgbtpzn-social,sikevux/bsk-social,sikevux/bsk-social,csarven/statusnet,studio666/gnu-social,csarven/statusnet,zcopley/StatusNet,csarven/statusnet,gnusocial/mainline,UngPirat/freesocial,charlycoste/StatusNet,eXcomm/gnu-social,Piratas/tortuga,sikevux/bsk-social,studio666/gnu-social,furtherfield/gnu-social,eXcomm/gnu-social,faulteh/gnu-social,charlycoste/StatusNet,Piratas/tortuga,sikevux/bsk-social,csarven/statusnet,bankonme/gnu-social,studio666/gnu-social,Piratas/tortuga,charnimda/lgbtpzn-social,eXcomm/gnu-social,bankonme/gnu-social,charnimda/lgbtpzn-social,gnusocial/mainline,bankonme/gnu-social,gnusocial/mainline,furtherfield/gnu-social,faulteh/gnu-social,faulteh/gnu-social,faulteh/gnu-social,furtherfield/gnu-social,chimo/social,Piratas/tortuga,zcopley/StatusNet,zcopley/StatusNet,chimo/social,furtherfield/gnu-social,charlycoste/StatusNet,eXcomm/gnu-social,foocorp/gnu-social,UngPirat/freesocial,foocorp/gnu-social,gnusocial/mainline,foocorp/gnu-social,UngPirat/freesocial,studio666/gnu-social