Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Mon, 8 Feb 2010 18:42:46 +0000 (13:42 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 8 Feb 2010 18:42:46 +0000 (13:42 -0500)

Trivial merge