# HG changeset patch
# User asaha
# Date 1307383732 25200
# Node ID 8ed03b0e3c9c83eabf3de5c1e62a2576a7c92d30
# Parent  bb1fdcebde01a7511e128daa9114fd3e722aa791# Parent  0adb806caf9d4ed7cf3864cf8ccbd09e8f976ff2
Merge