Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Fri, 15 Feb 2008 05:56:45 +0000 (00:56 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 15 Feb 2008 05:56:45 +0000 (00:56 -0500)

Trivial merge