Merge branch 'master' into friendlist
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 20 May 2010 07:14:11 +0000 (10:14 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 20 May 2010 07:14:11 +0000 (10:14 +0300)

Trivial merge