Merge commit 'mika/master'
authorDana Jansens <danakj@orodu.net>
Fri, 20 Jul 2007 20:01:10 +0000 (16:01 -0400)
committerDana Jansens <danakj@orodu.net>
Fri, 20 Jul 2007 20:01:10 +0000 (16:01 -0400)

Trivial merge