# HG changeset patch
# User pragmo <pragmo@pragmo.ano>
# Date 1294765605 0
# Node ID e57f811ead85151473d83f1513b796f3482994fa
# Parent  cff5cab73f870236719170a2a215b0303e1da2d6# Parent  2f826f1151deaf98cf50c79847591bb94533887e
Merge branch 'master' of git://1.3.9.1