# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1240328257 18000
# Node ID 52957fdae4379db50514c3b8a3d2cd84a0a2fa2d
# Parent  aa8d5ca0cab24c156ce2915f2268b289f74f40d5# Parent  94b6c67c9988e079d21abb01dcfb7fa1399597d7
merged heads