# HG changeset patch
# User asaha
# Date 1386569081 28800
# Node ID 96b54ffe6fd3a48a6272f84dcf17a0daca3e457c
# Parent  d382ef806d10ba6f3df3e4412406f2c24f1007d6# Parent  48367e6de87270be2f302ec1b801fdaee5a488ad
Merge