# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1297733411 -3600
# Node ID fac089efa5b4e58af3c6da928c7214c4f35d629a
# Parent  e7f35d6f87b10c569b26f744a64ea6bfe2756110# Parent  5393c823be88183b1d7bd19e6009a347a3b553fa
Merge branch 'master' of git://git1.somerandomnick.ano