# HG changeset patch
# User blanchet
# Date 1334850542 -7200
# Node ID 075b98ed1cabf5b63d9d3822d277de5dadf6d497
# Parent  c0fe12591c93f8866cf464ace4f003e2f829b2ca# Parent  b716b16ab2ac498e6461bd3fbc2bb7b9fcc31f1d
merged

diff -r b716b16ab2ac -r 075b98ed1cab Admin/contributed_components