# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 2007-06-14 20:32:35
# Node ID d8a08b92ad34e4a802836af9e1f9fe7f83fec849
# Parent  d2dde16819333b3f3f4ebacc41b779cbf8e414ba
# Parent  1fcc076fcb17f2b0f42340d2fef1dda730250cdd

Merge with stable