Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Tue, 12 Jan 2010 15:11:01 +0000 (10:11 -0500)
committerDana Jansens <danakj@orodu.net>
Tue, 12 Jan 2010 15:11:01 +0000 (10:11 -0500)

Trivial merge