Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 09:16:41 +0000 (04:16 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 09:16:41 +0000 (04:16 -0500)

Trivial merge