Merge branch 'rth/testing'
authorRichard Henderson <rth@twiddle.net>
Thu, 23 Sep 2010 15:05:17 +0000 (08:05 -0700)
committerRichard Henderson <rth@twiddle.net>
Thu, 23 Sep 2010 15:05:17 +0000 (08:05 -0700)

Trivial merge