# HG changeset patch
# User Liu Peng <rocky@slitaz.org>
# Date 1246026663 0
# Node ID 8968d2135586f9c45ec60a18798816cb736bfe33
# Parent  07a92deec1e6e24951bf32bbae2889317617eb8e# Parent  9107c12aad0ae7fb9d7716f23f5ee2bb49b8be98
merge