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

Trivial merge