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)
commit3afc6259757e8ec688701bf3e3d7fcdad28d5b6c
tree35c0e1ebb596dfe94934fc0f5f064eb523b3013b
parent62aa1d7f559622dcb04b1b2fe1e2ecec375883a3
parent121a894ce0d551e860392f9aa6bd381329a25b96
merge from head

--HG--
extra : convert_revision : 21f7afe2719c00744c0981212c1ee6e442238e01