Merge branch 'omigeot-master'
authorFriendika <info@friendika.com>
Thu, 27 Jan 2011 21:10:43 +0000 (13:10 -0800)
committerFriendika <info@friendika.com>
Thu, 27 Jan 2011 21:10:43 +0000 (13:10 -0800)

Trivial merge