Merge branch 'pull'
authorFriendika <info@friendika.com>
Fri, 21 Oct 2011 19:58:52 +0000 (12:58 -0700)
committerFriendika <info@friendika.com>
Fri, 21 Oct 2011 19:58:52 +0000 (12:58 -0700)

Trivial merge