merge 5.0.9 from test-context branch and remove my fix because Christophe Simonis...
authorDon Kirkby <donkirkby+launpd@gmail.com>
Fri, 30 Apr 2010 18:05:20 +0000 (11:05 -0700)
committerDon Kirkby <donkirkby+launpd@gmail.com>
Fri, 30 Apr 2010 18:05:20 +0000 (11:05 -0700)
commitf6e270398286a288a38bb35296fba9a182df5797
treeb5d95d3f9b9174f31b26a7ee15746f90a686c05d
parent6acc7961c82a96e35ba4440989106050d240d2d2
parent12b33521acb8073969aad3f3c679c78bb70905a7
merge 5.0.9 from test-context branch and remove my fix because Christophe Simonis duplicated it. Leave the test case in place.

bzr revid: donkirkby+launpd@gmail.com-20100430180520-4pxxemtv7fg64eqq