Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 18:37:44 +0000 (13:37 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 18:37:44 +0000 (13:37 -0500)

Trivial merge