Merge commit 'mika/backport' into backport
authorDana Jansens <danakj@orodu.net>
Sat, 12 Jan 2008 02:44:23 +0000 (21:44 -0500)
committerDana Jansens <danakj@orodu.net>
Sat, 12 Jan 2008 02:44:23 +0000 (21:44 -0500)

Trivial merge