Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/user.html

diff --cc mediagoblin/templates/mediagoblin/user_pages/user.html
index 6d9382621db324e1b6a64a937ed77c3b07bd999f,1de7f611d516a9c31a5fb16147939bd18e7e8d2a..d6a9fe1f524bbb2e3901c2ff8c0c80d06da2911b
--- 1/mediagoblin/templates/mediagoblin/user_pages/user.html
--- 2/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@@ -78,8 -89,8 +89,8 @@@
        {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%}
      </h1>
  
 -    {% if not user['url'] and not user['profile'] %}
 +    {% if not user['url'] and not user['bio'] %}
-       {% if request.user['_id'] == user['_id'] %}
+       {% if request.user._id == user._id %}
          <div class="grid_6 alpha empty_space">
            <p>
              {% trans %}Here's a spot to tell others about yourself.{% endtrans %}