Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Fri, 25 Jan 2008 05:49:50 +0000 (00:49 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 25 Jan 2008 05:49:50 +0000 (00:49 -0500)

Trivial merge