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)
commitc4c8a121863fcbde7ba67823f06a3f7564c27cba
treeaccca43f0d87a07f3bcedf46a88fd6e3a5e86167
parent2f93db6f95b02d2bedf9571330a3185ac3fa7fa9
parentae3e1d22fc3bfff8c246a0a743b77f4096d95b74
Merge from head.

--HG--
extra : convert_revision : af16bc685ea28e44b8120f16b72f60a21d68c1e2