Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Tue, 19 Feb 2008 01:52:06 +0000 (20:52 -0500)
committerDana Jansens <danakj@orodu.net>
Tue, 19 Feb 2008 01:52:06 +0000 (20:52 -0500)

Trivial merge