Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Wed, 16 Dec 2009 21:48:23 +0000 (16:48 -0500)
committerDana Jansens <danakj@orodu.net>
Wed, 16 Dec 2009 21:48:23 +0000 (16:48 -0500)

Trivial merge