# HG changeset patch
# User lana
# Date 1339653350 25200
# Node ID cccd816df0d6f38ecfad6fd98b4f1cf2687109cb
# Parent  35b2699c6243e9fb33648c2c25e97ec91d0e3553# Parent  45ea1fdc43764600667c317ad61fc2e2a6b4db5a
Merge