Merge branch 'omigeot-master'
authorFriendika <info@friendika.com>
Wed, 30 Mar 2011 21:33:04 +0000 (14:33 -0700)
committerFriendika <info@friendika.com>
Wed, 30 Mar 2011 21:33:04 +0000 (14:33 -0700)

Trivial merge