Merge branch 'mika'
authorDana Jansens <danakj@orodu.net>
Sun, 15 Jul 2007 16:36:50 +0000 (12:36 -0400)
committerDana Jansens <danakj@orodu.net>
Sun, 15 Jul 2007 16:36:50 +0000 (12:36 -0400)

Trivial merge