Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Fri, 5 Feb 2010 18:47:58 +0000 (13:47 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 5 Feb 2010 18:47:58 +0000 (13:47 -0500)

Trivial merge