# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1245685056 -7200
# Node ID 0952ca2f11ff5814293886de01dbb196a83fbea6
# Parent  4a6cf875fd7e44c0bf0e96b63abb0f74d79dbb08# Parent  58e54cfc221a9cc8e86207d700d5cba4edde5ae4
merge