# HG changeset patch
# User Richard Taylor <richard.i.taylor@nokia.com>
# Date 1264413036 0
# Node ID 608cc482dea8929fc39fa40724f161e609c4f352
# Parent  c02a2a09d864c324d0232c5578b2b7ea57fa9669# Parent  df63379a03bda3b9b183cdca12697734b247b7ae
merge from wip