# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1266241660 0
# Node ID fd8c90cfa36ca9db41d811e79e511250b8d4d9ba
# Parent  4e477ddf2eed2b478793a7c7ff22320e5ee6ce21# Parent  604f2aceff591c19942b925625ab8555bddc5206
Merge