# HG changeset patch
# User asaha
# Date 1379629877 25200
# Node ID cc9a05c9ad5c2ceac801b0daa9e23c8d851bb45f
# Parent  bdcd50ab61e599d6a097fdb5489a7dba485129fa# Parent  c782043adf1da85753a2c257018b4574aeea09a4
Merge

diff -r bdcd50ab61e5 -r cc9a05c9ad5c .hgtags