Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Fri, 22 Feb 2008 17:13:13 +0000 (12:13 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 22 Feb 2008 17:13:13 +0000 (12:13 -0500)

Trivial merge