Merge branch '2828' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 14 Oct 2010 23:52:01 +0000 (16:52 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 14 Oct 2010 23:52:01 +0000 (16:52 -0700)
commita2090ecc97f93894ba6f833acde5f44058988510
tree1dd53067dbf2b90331c681882e2c184a308994c3
parentfc6711327bcb2319139171ad3353603753f13eaa
parent56403c4beb939b71bf4412746eeaf6419afd7fea
Merge branch '2828' into 0.9.x