Merge branch 'backport' into 3.4-working release-3.4.4
authorDana Jansens <danakj@orodu.net>
Sat, 4 Aug 2007 21:40:05 +0000 (17:40 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 4 Aug 2007 21:40:05 +0000 (17:40 -0400)

Trivial merge