[PATCH] fixed merge for uint64

[Danny Kukawka]

On Mittwoch, 6. August 2008, Danny Kukawka wrote:
> From: Danny Kukawka <danny.kukawka at web.de>
> Subject: fixed merge for uint64
>
> Fixed typo to get merge working again with type=uint64.
>
> Should fix fd.o bug #16575.

Commited.

Danny