Merge bugfix for test-suite correctness.

The test suite was recently broken, and subsequently fixed (at the
commit that introduced the breakage). This merges that fixup commit:

	f1776f8b51
This commit is contained in:
Carl Worth 2010-04-14 17:19:42 -07:00
commit 7d06e14e79