# HG changeset patch
# User cmlenz
# Date 1272490239 0
# Node ID be8d2d828be66adfb983d026909253e2ec3852a4
# Parent  bf20de18289c28965f16b3a78551ddf97bfaf96b
inline branch: move to native svn merge tracking.