Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Mon, 25 Jan 2010 20:00:39 +0000 (15:00 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 25 Jan 2010 20:00:39 +0000 (15:00 -0500)

Trivial merge