# HG changeset patch
# User asaha
# Date 1306455973 25200
# Node ID 06425ec3870475b2e3f1d9ca029a314d4b62c09e
# Parent  07a8728ad49ef6dfa469c3a8bf5ab1e9c80bed5c# Parent  d1842c595bb95e816e0f6fd2c752f840c15f467c
Merge