# HG changeset patch
# User contrebasse
# Date 1306948597 -7200
# Node ID 3daeb57da1a9885c4148dd867571e1837fd94505
# Parent  60dfeef236202b6e6b8e3c178ce778052c5ba9c4# Parent  9628fac582571814682fe8a7582fb803736ef364
Automated merge with ssh://hg.wowace.com/wow/degaine/mainline