# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1335860002 -7200
# Node ID 8dae9b6faf9c3db7f9079df043b76d555f694c5c
# Parent  fe622b3761269a754ef350ed6b61dc461cd96b49# Parent  24c4e4a06c2254fceac91d4d1e11337310f33148
merge