Merge branch 'backport' into 3.4-working release-3.4.7-pre1
authorDana Jansens <danakj@orodu.net>
Thu, 28 Feb 2008 03:20:30 +0000 (22:20 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 28 Feb 2008 03:20:30 +0000 (22:20 -0500)

Trivial merge