Merge from head.
authorSteve Reinhardt <stever@gmail.com>
Tue, 31 Jul 2007 04:37:07 +0000 (00:37 -0400)
committerSteve Reinhardt <stever@gmail.com>
Tue, 31 Jul 2007 04:37:07 +0000 (00:37 -0400)
--HG--
extra : convert_revision : af16bc685ea28e44b8120f16b72f60a21d68c1e2


Trivial merge