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()

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