Merge branch 'backport'
authorDana Jansens <danakj@orodu.net>
Sun, 20 Jan 2008 06:36:43 +0000 (01:36 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 20 Jan 2008 06:36:43 +0000 (01:36 -0500)

Trivial merge