# HG changeset patch # User Christian Ebert # Date 1245622657 -3600 # Node ID d5882243b1f97fb023b1da71a17ec9e682e879d7 # Parent 1dc66cff9dd55b4cec1e7dae1ff8d02d0cc6d627# Parent 9ce1481a6c3f727b8b8350a7d833aa6fe7df0623 Merge with stable