# HG changeset patch
# User cmlenz
# Date 1272490239 0
# Node ID 39f5bfe11d915b6eef2d6acb5faa75cef16d5985
# Parent  90411fa28c3ed00697f85697fc99eef1c0ba0642
inline branch: move to native svn merge tracking.