Merge branch 'master' into clear_user_avatar_image
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 6 Sep 2010 07:12:42 +0000 (10:12 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 6 Sep 2010 07:12:42 +0000 (10:12 +0300)

Trivial merge