# HG changeset patch
# User laurent
# Date 1326204682 -3600
# Node ID 5132c497918c769f06ff44593f02b233f532d15e
# Parent  e579bd6faa870b608c11ee9bf299a39fe56504df# Parent  87f428326f9b12682754cb74a1dc6911de11d768
Merge with Donggu modifications