# HG changeset patch
# User pragmo <pragmo@pragmo.ano>
# Date 1288896764 0
# Node ID 6541a8ac29fdafcf7909eef1e859f452093fa249
# Parent  a3cccef9379e086de170a900e361db830ce1cecc# Parent  389a1005eb51a81abb35e120532c23f392c1ddc0
Merge branch 'master' of git://1.0.49.10