Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Tue, 8 Dec 2009 20:57:11 +0000 (15:57 -0500)
committerDana Jansens <danakj@orodu.net>
Tue, 8 Dec 2009 20:57:11 +0000 (15:57 -0500)

Trivial merge