# HG changeset patch # User Matt Mackall # Date 1248135518 18000 # Node ID 8864112d4f57815b11d49dff22d25969d3ae23a8 # Parent efe990445b331256bebd07b29e7a1ef6f56df338# Parent 41bc92142f0636a8d8d820944499c77217574190 Merge with stable