Merge branch 'categorylist_class'
authorOlavi Pulkkinen <olavi.pulkkinen@fudeco.com>
Thu, 11 Mar 2010 11:16:21 +0000 (13:16 +0200)
committerOlavi Pulkkinen <olavi.pulkkinen@fudeco.com>
Thu, 11 Mar 2010 11:16:21 +0000 (13:16 +0200)

Trivial merge