# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1288344604 -7200
# Node ID 5120c3bf578e5fbcbcc9fee50a257e1ea2ae6841
# Parent  3dc19203f35fc6540a2f4b63503597a2d0a933cc# Parent  1d8ab38d7823a16fd41e76feb94e479b3ce738bc
Merge branch 'master' of git://git1.somerandomnick.ano