# HG changeset patch
# User asaha
# Date 1329519561 28800
# Node ID 456621c5d797c75ef5b3d071337533fdb0bf9e80
# Parent  329ace7198ac05c0eed7cf3f591783df0aff5dea# Parent  4289a81ba08526694baca616dfd747cc7b379ec7
Merge