Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 7 Jan 2010 18:26:28 +0000 (13:26 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 7 Jan 2010 18:26:28 +0000 (13:26 -0500)

Trivial merge