# HG changeset patch
# User yutaka@localhost.localdomain
# Date 1288966211 -32400
# Node ID fc6876952e04e53a149d84b893eb7c43f45bbf16
# Parent  54a74800d1a65818aa2bf71d43baeb79acda3a42# Parent  0c1a81f074c6942a8b56d7f298ec50fd6c0e924e
merge