Merge branch 'backport' into 3.4-working release-3.4.7-pre2
authorDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 23:31:35 +0000 (18:31 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 23:31:35 +0000 (18:31 -0500)

Trivial merge