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

Trivial merge