Merge branch 'bug_friend_item_update'
authorSami Rämö <sami.ramo@ixonos.com>
Wed, 12 May 2010 10:41:42 +0000 (13:41 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Wed, 12 May 2010 10:41:42 +0000 (13:41 +0300)

Trivial merge