Merge branch 'imlib-submenus' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Wed, 10 Sep 2008 16:11:24 +0000 (18:11 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Wed, 10 Sep 2008 16:11:24 +0000 (18:11 +0200)

Trivial merge