# HG changeset patch
# User eldar1@eldar1-laptop
# Date 1265557566 0
# Node ID ed7018b63aa7a6fca012d167b2d6d8535af4eb56
# Parent  307af59d8bd83212ee8e1c016c298042fb5b541c# Parent  70f64e5b594216c82fb4788ab894c4b3427517d5
merge 2