Merge remote-tracking branch 'origin/cmetcalf/tile_not_cancel_h'
authorRoland McGrath <roland@hack.frob.com>
Mon, 30 Jan 2012 17:49:39 +0000 (09:49 -0800)
committerRoland McGrath <roland@hack.frob.com>
Mon, 30 Jan 2012 17:49:39 +0000 (09:49 -0800)
commitde9298c991eba226e15e99f39f2d66bd4d219f62
tree006ec355d559524a2801dda1564d4c93a50abdbf
parent53fb8811fd7873ab67d55d72386a303e9734603a
parent540d7568aefbc870e8f618905cfbc38f9e6fcc61
Merge remote-tracking branch 'origin/cmetcalf/tile_not_cancel_h'

Conflicts:
ChangeLog
ChangeLog