# HG changeset patch
# User Zheng Shen <zheng.shen@nokia.com>
# Date 1288179492 -28800
# Node ID 2068325a5906f0b5c991567243930f8df28cb2e3
# Parent  44b0e894b7ab696703b92569c26f3fc80994ed40# Parent  8e27d440923e02df7b9e1f06d074d28424856b1b
Merge: remove incorrect heard