Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sat, 4 Aug 2007 19:45:27 +0000 (15:45 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 4 Aug 2007 19:45:27 +0000 (15:45 -0400)

Trivial merge