Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 28 Feb 2008 01:59:33 +0000 (20:59 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 28 Feb 2008 01:59:33 +0000 (20:59 -0500)

Trivial merge