Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Mon, 8 Feb 2010 19:28:04 +0000 (14:28 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 8 Feb 2010 19:28:04 +0000 (14:28 -0500)

Trivial merge