Merge branch 'mikabox/maybe' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Sat, 4 Oct 2008 10:52:59 +0000 (12:52 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Sat, 4 Oct 2008 10:52:59 +0000 (12:52 +0200)

Trivial merge