Merge branch 'backport' into 3.4-working release-3.4.6
authorDana Jansens <danakj@orodu.net>
Sat, 2 Feb 2008 17:59:35 +0000 (12:59 -0500)
committerDana Jansens <danakj@orodu.net>
Sat, 2 Feb 2008 17:59:35 +0000 (12:59 -0500)

Trivial merge