# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1267547310 0
# Node ID 15d964981d940601fad8380076a06dcb96a71dd6
# Parent  5190d528364bedad44e7cc65b99ad40c4d915745# Parent  7029b5be2b15190699d0b9e63b6a7b1db496cd67
Merge default back into fix.