[merge] make selftest pass on a slow cpu

[John Arbash Meinel]

John Arbash Meinel has voted +1 (conditional).
Status is now: Conditionally approved
Comment:
I'm fine with having it merged, but I seem to have forgotten how we 
wanted to tweak the regex.

Was it just?
self.assertContainsRe(timed_string, "^ +[0-9]+ms$")

rather than:
self.assertContainsRe(timed_string, "^ +(0|[1-9][0-9]*)ms$")

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C20070511005606.GA25986%40cyclops.localdomain%3E