Change-Id: I0722e720dbc017186cefd0e45dd5a11023906b56 Reviewed-by: Andy Nichols <andy.nichols@digia.com>