Hi Frédéric,

On 04/13/2011 11:05 AM, Frédéric Danis wrote:
> Conflicts:
> 
> 	src/emulator.c

I took out this comment

> ---
>  src/emulator.c |   77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
>  1 files changed, 76 insertions(+), 1 deletions(-)
> 

... and applied this patch.  Thanks.

Regards,
-Denis