merge from head
authorSteve Reinhardt <stever@gmail.com>
Fri, 3 Aug 2007 07:51:30 +0000 (03:51 -0400)
committerSteve Reinhardt <stever@gmail.com>
Fri, 3 Aug 2007 07:51:30 +0000 (03:51 -0400)
--HG--
extra : convert_revision : 21f7afe2719c00744c0981212c1ee6e442238e01


Trivial merge