Merge from head.
authorSteve Reinhardt <stever@gmail.com>
Sun, 22 Jul 2007 22:02:40 +0000 (18:02 -0400)
committerSteve Reinhardt <stever@gmail.com>
Sun, 22 Jul 2007 22:02:40 +0000 (18:02 -0400)
--HG--
extra : convert_revision : dd23c568b3777fed7973401b6cf035f5a14f12f3


Trivial merge