Merge bugfix for test-suite correctness.
authorCarl Worth <cworth@cworth.org>
Thu, 15 Apr 2010 00:19:42 +0000 (17:19 -0700)
committerCarl Worth <cworth@cworth.org>
Thu, 15 Apr 2010 00:19:46 +0000 (17:19 -0700)
The test suite was recently broken, and subsequently fixed (at the
commit that introduced the breakage). This merges that fixup commit:

f1776f8b51013bb66eb21e64c8084ddfe73c3a5c


Trivial merge